[pkgsrc/trunk]: pkgsrc/print/hplip py-reportlab supports python-3.x.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/366508b9a362
branches:  trunk
changeset: 352262:366508b9a362
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Sep 11 16:41:16 2016 +0000

description:
py-reportlab supports python-3.x.

diffstat:

 print/hplip/options.mk |  11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diffs (32 lines):

diff -r d2b92ab9020e -r 366508b9a362 print/hplip/options.mk
--- a/print/hplip/options.mk    Sun Sep 11 16:41:00 2016 +0000
+++ b/print/hplip/options.mk    Sun Sep 11 16:41:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2016/07/09 13:04:02 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2016/09/11 16:41:16 wiz Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -22,7 +22,6 @@
 EGFILES+=              cups/pstotiff.convs cups/pstotiff.types
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/cups
 DEPENDS+=      ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 # py-reportlab
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .else
@@ -36,13 +35,7 @@
 MESSAGE_SRC+=          MESSAGE.scan
 MESSAGE_SUBST+=                EGDIR=${EGDIR}
 .include "../../graphics/sane-backends/buildlink3.mk"
-# XXX: a dependency installs py-Pillow, which conflicts
-# .include "../../graphics/py-imaging/buildlink3.mk"
-# DEPENDS+=    ${PYPKGPREFIX}-Pillow-[0-9]*:../../print/py-Pillow
-# version depends on if py-reportlab was installed before we called
-# out an imaging library.
-DEPENDS+=      {${PYPKGPREFIX}-imaging-[0-9]*,${PYPKGPREFIX}-Pillow-[0-9]*}:../../graphics/py-imaging
-# PYTHON_VERSIONS_INCOMPATIBLE=        34 35 # py-imaging
+DEPENDS+=      {${PYPKGPREFIX}-Pillow-[0-9]*,${PYPKGPREFIX}-imaging-[0-9]*}:../../graphics/py-Pillow
 .else
 CONFIGURE_ARGS+=       --disable-scan-build
 .endif