CVS commit: pkgsrc/graphics/py-pycha

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 11 20:17:13 UTC 2020

Modified Files:
        pkgsrc/graphics/py-pycha: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/py-pycha: ALTERNATIVES
        pkgsrc/graphics/py-pycha/patches: patch-chavier_gui.py

Log Message:
py-pycha: update to 0.8.1.

0.8.1 (2019-11-17)
---------------------
- Forgot to update Changelog for 0.8.0

0.8.0 (2019-11-17)
---------------------
- Add support for Python 3 by encukou
- Add support for Tox, Pyflakes, Coverage and Buildbucket pipelines
- Remove support for Buildout


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/py-pycha/ALTERNATIVES
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/py-pycha/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/py-pycha/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/py-pycha/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/py-pycha/patches/patch-chavier_gui.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/py-pycha/Makefile
diff -u pkgsrc/graphics/py-pycha/Makefile:1.19 pkgsrc/graphics/py-pycha/Makefile:1.20
--- pkgsrc/graphics/py-pycha/Makefile:1.19      Sat Nov  2 22:38:03 2019
+++ pkgsrc/graphics/py-pycha/Makefile   Wed Mar 11 20:17:12 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2019/11/02 22:38:03 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/11 20:17:12 wiz Exp $
 
-DISTNAME=      pycha-0.7.0
+DISTNAME=      pycha-0.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pycha/}
@@ -10,13 +10,13 @@ HOMEPAGE=   https://bitbucket.org/lgs/pych
 COMMENT=       Library for making charts with Python
 LICENSE=       gnu-lgpl-v3
 
-DEPENDS+=      ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
-DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+=      ${PYPKGPREFIX}-cairocffi-[0-9]*:../../graphics/py-cairocffi
+DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES= #none
 
-PYTHON_SELF_CONFLICT=          yes
-PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
+post-install:
+       ${MV} ${DESTDIR}${PREFIX}/bin/chavier ${DESTDIR}${PREFIX}/bin/chavier-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-pycha/PLIST
diff -u pkgsrc/graphics/py-pycha/PLIST:1.2 pkgsrc/graphics/py-pycha/PLIST:1.3
--- pkgsrc/graphics/py-pycha/PLIST:1.2  Wed Jun 25 07:35:11 2014
+++ pkgsrc/graphics/py-pycha/PLIST      Wed Mar 11 20:17:12 2020
@@ -1,5 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2014/06/25 07:35:11 richard Exp $
-bin/chavier
+@comment $NetBSD: PLIST,v 1.3 2020/03/11 20:17:12 wiz Exp $
+bin/chavier-${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/chavier/__init__.py
 ${PYSITELIB}/chavier/__init__.pyc
 ${PYSITELIB}/chavier/__init__.pyo
@@ -12,12 +19,6 @@ ${PYSITELIB}/chavier/dialogs.pyo
 ${PYSITELIB}/chavier/gui.py
 ${PYSITELIB}/chavier/gui.pyc
 ${PYSITELIB}/chavier/gui.pyo
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/pycha/__init__.py
 ${PYSITELIB}/pycha/__init__.pyc
 ${PYSITELIB}/pycha/__init__.pyo
@@ -30,6 +31,9 @@ ${PYSITELIB}/pycha/chart.pyo
 ${PYSITELIB}/pycha/color.py
 ${PYSITELIB}/pycha/color.pyc
 ${PYSITELIB}/pycha/color.pyo
+${PYSITELIB}/pycha/compat.py
+${PYSITELIB}/pycha/compat.pyc
+${PYSITELIB}/pycha/compat.pyo
 ${PYSITELIB}/pycha/line.py
 ${PYSITELIB}/pycha/line.pyc
 ${PYSITELIB}/pycha/line.pyo

Index: pkgsrc/graphics/py-pycha/distinfo
diff -u pkgsrc/graphics/py-pycha/distinfo:1.4 pkgsrc/graphics/py-pycha/distinfo:1.5
--- pkgsrc/graphics/py-pycha/distinfo:1.4       Tue Nov  3 21:34:17 2015
+++ pkgsrc/graphics/py-pycha/distinfo   Wed Mar 11 20:17:12 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 21:34:17 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/03/11 20:17:12 wiz Exp $
 
-SHA1 (pycha-0.7.0.tar.gz) = a03b5d2a8ac35e21d8db3d3c2135e1b3245757ef
-RMD160 (pycha-0.7.0.tar.gz) = fb79e48bfcc8871f6b527f9a11df0a2ad860f481
-SHA512 (pycha-0.7.0.tar.gz) = 98b53651b7c4a8390cded41eed87113635c8f81ec8ec34455ba530ca69bac3b7140273111f13eba1080510b459ec546571813081ac2ba215fc924a3c1069c8f6
-Size (pycha-0.7.0.tar.gz) = 41570 bytes
+SHA1 (pycha-0.8.1.tar.gz) = 1126f3515469444b52d7b70b184412fd20e3a11c
+RMD160 (pycha-0.8.1.tar.gz) = 99e3883f6529c029ef37267fcd3f2fe5c4e85c8c
+SHA512 (pycha-0.8.1.tar.gz) = d4d173004c9c0ac7db73631c6ac380c6fdef54a3d245dde9ebc32c9fa6f3cd27b486d10e725ee45598605324b63809687ba41de5cb4fbe591bc5cb09241f6be5
+Size (pycha-0.8.1.tar.gz) = 43399 bytes
 SHA1 (patch-chavier_app.py) = 11f3e5d310772fc8bf5c8eba48a5e9b9acdbcc1f
+SHA1 (patch-chavier_gui.py) = 838bee4214c8940c39e59efffce5d196a89ce3a8

Added files:

Index: pkgsrc/graphics/py-pycha/ALTERNATIVES
diff -u /dev/null pkgsrc/graphics/py-pycha/ALTERNATIVES:1.1
--- /dev/null   Wed Mar 11 20:17:13 2020
+++ pkgsrc/graphics/py-pycha/ALTERNATIVES       Wed Mar 11 20:17:12 2020
@@ -0,0 +1 @@
+bin/chavier @PREFIX@/bin/chavier-@PYVERSSUFFIX@

Index: pkgsrc/graphics/py-pycha/patches/patch-chavier_gui.py
diff -u /dev/null pkgsrc/graphics/py-pycha/patches/patch-chavier_gui.py:1.1
--- /dev/null   Wed Mar 11 20:17:13 2020
+++ pkgsrc/graphics/py-pycha/patches/patch-chavier_gui.py       Wed Mar 11 20:17:12 2020
@@ -0,0 +1,37 @@
+$NetBSD: patch-chavier_gui.py,v 1.1 2020/03/11 20:17:12 wiz Exp $
+
+Convert to python3 syntax.
+
+--- chavier/gui.py.orig        2011-08-08 19:23:18.000000000 +0000
++++ chavier/gui.py
+@@ -523,18 +523,18 @@ class GUI(object):
+ 
+         alloc = self.drawing_area.get_allocation()
+ 
+-        print 'CHART STATE'
+-        print '-' * 70
+-        print 'surface: %d x %d' % (alloc.width, alloc.height)
+-        print 'area   :', self.chart.area
+-        print
+-        print 'minxval:', self.chart.minxval
+-        print 'maxxval:', self.chart.maxxval
+-        print 'xrange :', self.chart.xrange
+-        print
+-        print 'minyval:', self.chart.minyval
+-        print 'maxyval:', self.chart.maxyval
+-        print 'yrange :', self.chart.yrange
++        print('CHART STATE')
++        print('-' * 70)
++        print('surface: %d x %d' % (alloc.width, alloc.height))
++        print('area   :', self.chart.area)
++        prin()
++        print('minxval:', self.chart.minxval)
++        print('maxxval:', self.chart.maxxval)
++        print('xrange :', self.chart.xrange)
++        print()
++        print('minyval:', self.chart.minyval)
++        print('maxyval:', self.chart.maxyval)
++        print('yrange :', self.chart.yrange)
+ 
+     def about(self, action=None):
+         dialog = AboutDialog(self.main_window)