Updated to build with Python 3.x -- removed dependency on py-xml (it was

    no longer needed/required.)

Updated to 3.15.7

Release Notes:

HPLIP 3.15.7 - This release has the following changes:
Added Support for the Following New Printers:

- HP Deskjet 1110 Printer
- HP Deskjet 1111 Printer
- HP Deskjet 1112 Printer
- HP DeskJet 2131 All-in-One Printer
- HP Deskjet Ink Advantage 1110 Printer
- HP Deskjet Ink Advantage 1115 Printer
- HP Deskjet Ink Advantage 1118 Printer
- HP DeskJet Ink Advantage 2130 All-in_One Printer
- HP DeskJet Ink Advantage 2135 All-in_One Printer
- HP DeskJet Ink Advantage 2138 All-in_One Printer
- HP DeskJet Ink Advantage 3630 All-in-One Printer
- HP DeskJet Ink Advantage 3635 All-in-One Printer
- HP DeskJet Ink Advantage 3636 All-in-One Printer
- HP DeskJet Ink Advantage 3638 All-in-One Printer
- HP DeskJet Ink Advantage 3830 All-in-One Printer
- HP DeskJet Ink Advantage 3835 All-in-One Printer
- HP OfficeJet 3830 All-in-One Printer
- HP OfficeJet 3832 All-in-One Printer
- HP OfficeJet 3834 All-in-One Printer
- HP Officejet 7510 Wide Format All-in-One Printer

Added support for the following new Distro's:

- Debian 8.1
- RHEL 7.1

Issues fixed:

- Removed the duplicate collate option from HP Device Manager
- Traceback error occurs when trying to configure a queue of same name
  but with different IO type
- Traceback error occurs when trying to add unicode file from Device
  Manager on RHEL5

Launchpad fixes:

1464013 - HPLIP installer prompts to set up printers, even when printers
	are already set up
1432516 - Insecure binary driver verification (CVE-2015-0839)

3 files changed, 15 insertions, 11 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 325a3b39424..8657661559c 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2015/06/17 10:21:02 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2015/08/14 19:45:29 schnoebe Exp $
 
-DISTNAME=		hplip-3.15.6
-PKGREVISION=		1
+DISTNAME=		hplip-3.15.7
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
@@ -18,8 +17,6 @@ FILES_SUBST+=           CUPS_GROUP=${CUPS_GROUP}
 PKG_GROUPS_VARS+=       CUPS_GROUP
 PKG_USERS_VARS+=        CUPS_USER
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-xml
-
 BUILD_DEFS+=            CUPS_USER CUPS_GROUP VARBASE
 
 GNU_CONFIGURE=		yes
@@ -181,6 +178,5 @@ post-install:
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/py-xml/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index 025069d2816..d9096f16aa5 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.16 2015/06/14 21:50:53 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.17 2015/08/14 19:45:29 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -550,6 +550,8 @@ share/hplip/ppd/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1050_j410_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1100-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1100.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1110_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_1110_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1120-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1120.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_1125-hpijs.ppd.gz
@@ -630,6 +632,8 @@ share/hplip/ppd/HP/hp-deskjet_3820-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3820.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3822-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3822.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3830_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3830_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3840-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3840.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3870-hpijs.ppd.gz
@@ -1498,6 +1502,8 @@ share/hplip/ppd/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_150_mobile_l511.ppd.gz
 share/hplip/ppd/HP/hp-officejet_2620_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_2620_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_3830_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_3830_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4000_k210.ppd.gz
 share/hplip/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
@@ -1586,6 +1592,8 @@ share/hplip/ppd/HP/hp-officejet_7400_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7400_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7500_e910-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7500_e910.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7510_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7510_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7610_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7610_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_8040_series-hpijs.ppd.gz
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index d46ead4e658..e7cc5fc9c30 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2015/06/17 10:21:02 wiz Exp $
+$NetBSD: distinfo,v 1.18 2015/08/14 19:45:29 schnoebe Exp $
 
-SHA1 (hplip-3.15.6.tar.gz) = dba9839d3daf1a2dc464a0d3094ba9b71fea422c
-RMD160 (hplip-3.15.6.tar.gz) = ded043f1c5c03949957057647f5e3bbeda3d6885
-Size (hplip-3.15.6.tar.gz) = 21956752 bytes
+SHA1 (hplip-3.15.7.tar.gz) = f84e33b749ef34939c11b253767686c00ca2c30c
+RMD160 (hplip-3.15.7.tar.gz) = b8f5b9be838ed9261cb208df46b5aa7ef6680e31
+Size (hplip-3.15.7.tar.gz) = 21979938 bytes
 SHA1 (patch-aa) = 68bede16003a2d43c93a0ef547857b9e4196312e
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
 SHA1 (patch-ae) = 0dfdef7ebb56b04c7d910bf0add1a035fc32a7e7