Fri Nov 11 12:47:53 2016 UTC ()
Fix reportlab version check for 3.x and later.


(joerg)
diff -r1.15 -r1.16 pkgsrc/print/py-pisa/Makefile
diff -r1.7 -r1.8 pkgsrc/print/py-pisa/distinfo
diff -r0 -r1.1 pkgsrc/print/py-pisa/patches/patch-sx_pisa3_pisa__util.py
cvs diff -r1.15 -r1.16 pkgsrc/print/py-pisa/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/py-pisa/Attic/Makefile 2016/11/08 11:42:01 1.15
+++ pkgsrc/print/py-pisa/Attic/Makefile 2016/11/11 12:47:52 1.16
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.15 2016/11/08 11:42:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2016/11/11 12:47:52 joerg Exp $
2 2
3DISTNAME= pisa-3.0.33 3DISTNAME= pisa-3.0.33
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= textproc print www python 6CATEGORIES= textproc print www python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pisa/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/pisa/}
7 8
8OWNER= joerg@NetBSD.org 9OWNER= joerg@NetBSD.org
9HOMEPAGE= http://www.htmltopdf.org/ 10HOMEPAGE= http://www.htmltopdf.org/
10COMMENT= HTML2pdf converter (obsolete, use print/py-weasyprint instead) 11COMMENT= HTML2pdf converter (obsolete, use print/py-weasyprint instead)
11LICENSE= apache-2.0 12LICENSE= apache-2.0
12 13
13DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf 14DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
14DEPENDS+= ${PYPKGPREFIX}-reportlab>=2.2:../../print/py-reportlab 15DEPENDS+= ${PYPKGPREFIX}-reportlab>=2.2:../../print/py-reportlab
15DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 16DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
16 17
17PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not ported as of 3.0.33 18PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not ported as of 3.0.33
cvs diff -r1.7 -r1.8 pkgsrc/print/py-pisa/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/py-pisa/Attic/distinfo 2016/11/08 11:42:01 1.7
+++ pkgsrc/print/py-pisa/Attic/distinfo 2016/11/11 12:47:52 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2016/11/08 11:42:01 wiz Exp $ 1$NetBSD: distinfo,v 1.8 2016/11/11 12:47:52 joerg Exp $
2 2
3SHA1 (pisa-3.0.33.tar.gz) = 3d7e644b96b7c8f98bfd5823a163c3badd662209 3SHA1 (pisa-3.0.33.tar.gz) = 3d7e644b96b7c8f98bfd5823a163c3badd662209
4RMD160 (pisa-3.0.33.tar.gz) = 1479865d1f0b14f4a37c74fc8aae7e72e9d0efac 4RMD160 (pisa-3.0.33.tar.gz) = 1479865d1f0b14f4a37c74fc8aae7e72e9d0efac
5SHA512 (pisa-3.0.33.tar.gz) = 5d11d717734ca30876697ce25c77f381a560f4b266b2dbd9f2445ac9b39e2750cc3ff31603d9a1cba6ed51a047fca38ac95a2a4dddf88b238aa5c0d6f810a975 5SHA512 (pisa-3.0.33.tar.gz) = 5d11d717734ca30876697ce25c77f381a560f4b266b2dbd9f2445ac9b39e2750cc3ff31603d9a1cba6ed51a047fca38ac95a2a4dddf88b238aa5c0d6f810a975
6Size (pisa-3.0.33.tar.gz) = 4500555 bytes 6Size (pisa-3.0.33.tar.gz) = 4500555 bytes
7SHA1 (patch-aa) = 39354cac1592787d43622c04ef776f13b39450ca 7SHA1 (patch-aa) = 39354cac1592787d43622c04ef776f13b39450ca
 8SHA1 (patch-sx_pisa3_pisa__util.py) = 130f9ac339239b71fc6a4920c0cadcccdbc1a913
File Added: pkgsrc/print/py-pisa/patches/Attic/patch-sx_pisa3_pisa__util.py
$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