[pkgsrc/trunk]: pkgsrc/print/py-pisa Fix reportlab version check for 3.x and ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d70d61c54edd
branches:  trunk
changeset: 354818:d70d61c54edd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 11 12:47:52 2016 +0000

description:
Fix reportlab version check for 3.x and later.

diffstat:

 print/py-pisa/Makefile                             |   3 ++-
 print/py-pisa/distinfo                             |   3 ++-
 print/py-pisa/patches/patch-sx_pisa3_pisa__util.py |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 537c99206bc8 -r d70d61c54edd print/py-pisa/Makefile
--- a/print/py-pisa/Makefile    Fri Nov 11 10:54:59 2016 +0000
+++ b/print/py-pisa/Makefile    Fri Nov 11 12:47:52 2016 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2016/11/08 11:42:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/11/11 12:47:52 joerg Exp $
 
 DISTNAME=      pisa-3.0.33
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    textproc print www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pisa/}
 
diff -r 537c99206bc8 -r d70d61c54edd print/py-pisa/distinfo
--- a/print/py-pisa/distinfo    Fri Nov 11 10:54:59 2016 +0000
+++ b/print/py-pisa/distinfo    Fri Nov 11 12:47:52 2016 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/11/08 11:42:01 wiz Exp $
+$NetBSD: distinfo,v 1.8 2016/11/11 12:47:52 joerg Exp $
 
 SHA1 (pisa-3.0.33.tar.gz) = 3d7e644b96b7c8f98bfd5823a163c3badd662209
 RMD160 (pisa-3.0.33.tar.gz) = 1479865d1f0b14f4a37c74fc8aae7e72e9d0efac
 SHA512 (pisa-3.0.33.tar.gz) = 5d11d717734ca30876697ce25c77f381a560f4b266b2dbd9f2445ac9b39e2750cc3ff31603d9a1cba6ed51a047fca38ac95a2a4dddf88b238aa5c0d6f810a975
 Size (pisa-3.0.33.tar.gz) = 4500555 bytes
 SHA1 (patch-aa) = 39354cac1592787d43622c04ef776f13b39450ca
+SHA1 (patch-sx_pisa3_pisa__util.py) = 130f9ac339239b71fc6a4920c0cadcccdbc1a913
diff -r 537c99206bc8 -r d70d61c54edd print/py-pisa/patches/patch-sx_pisa3_pisa__util.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/py-pisa/patches/patch-sx_pisa3_pisa__util.py        Fri Nov 11 12:47:52 2016 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-sx_pisa3_pisa__util.py,v 1.1 2016/11/11 12:47:52 joerg Exp $
+
+--- sx/pisa3/pisa_util.py.orig 2010-06-16 13:43:35.000000000 +0000
++++ sx/pisa3/pisa_util.py
+@@ -51,10 +51,10 @@ import shutil
+ 
+ rgb_re = re.compile("^.*?rgb[(]([0-9]+).*?([0-9]+).*?([0-9]+)[)].*?[ ]*$")
+ 
+-if not(reportlab.Version[0] == "2" and reportlab.Version[2] >= "1"):
++if int(reportlab.Version[0]) < 2 or (reportlab.Version[0] == "2" and reportlab.Version[2] == "0"):
+     raise ImportError("Reportlab Version 2.1+ is needed!")
+ 
+-REPORTLAB22 = (reportlab.Version[0] == "2" and reportlab.Version[2] >= "2")
++REPORTLAB22 = not(reportlab.Version[0] == "2" and reportlab.Version[2] == "1")
+ # print "***", reportlab.Version, REPORTLAB22, reportlab.__file__
+ 
+ import logging