Add libusb0 use flag. This fixes bug #438870. Some old printers do not work with libusb:1. Thanks to Ben for the report.

(Portage version: 2.1.11.9/cvs/Linux i686)

3 files changed, 17 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 4e2e0c93da90..f43d4202101d 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.245 2012/10/17 03:19:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.246 2012/10/19 16:57:08 billie Exp $
+
+  19 Oct 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.10a.ebuild,
+  metadata.xml:
+  Add libusb0 use flag. This fixes bug #438870. Some old printers do not work
+  with libusb:1. Thanks to Ben for the report.
 
   17 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> hplip-3.12.9-r1.ebuild:
   x86 stable wrt bug #436858
diff --git a/net-print/hplip/hplip-3.12.10a.ebuild b/net-print/hplip/hplip-3.12.10a.ebuild
index 3e00a89bc6d4..9547099d6cfe 100644
--- a/net-print/hplip/hplip-3.12.10a.ebuild
+++ b/net-print/hplip/hplip-3.12.10a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a.ebuild,v 1.1 2012/10/12 17:22:12 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a.ebuild,v 1.2 2012/10/19 16:57:08 billie Exp $
 
 EAPI=4
 
@@ -21,14 +21,15 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 # zeroconf does not work properly with >=cups-1.4.
 # Thus support for it is also disabled in hplip.
-IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X"
+IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
 
 COMMON_DEPEND="
 	virtual/jpeg
 	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
 	!minimal? (
 		>=net-print/cups-1.4.0
-		virtual/libusb:1
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
 		fax? ( sys-apps/dbus )
 		snmp? (
@@ -137,6 +138,12 @@ src_configure() {
 		myconf="${myconf} --disable-dbus-build"
 	fi
 
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
 	if use hpcups ; then
 		drv_build="$(use_enable hpcups hpcups-install)"
 		if use static-ppds ; then
@@ -186,7 +193,6 @@ src_configure() {
 		--disable-foomatic-rip-hplip-install \
 		--disable-shadow-build \
 		--disable-qt3 \
-		--disable-libusb01_build \
 		--disable-udev_sysfs_rules \
 		--disable-udev-acl-rules \
 		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index f2e90b5d4ec3..9e6ad145b5d7 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="hpijs">Build the IJS driver for cups (Foomatic)</flag>
 		<flag name="kde">Enables <pkg>kde-misc/skanlite</pkg> as scanner GUI with USE="scanner X"</flag>
 		<flag name="libnotify">Enables desktop notifications</flag>
+		<flag name="libusb0">Depend on <pkg>virtual/libusb:0</pkg>. Some old printers do not work with <pkg>virtual/libusb:1</pkg></flag>
 		<flag name="minimal">Only build internal hpijs/hpcups driver (not recommended at all, make sure you know what you are doing)</flag>
 		<flag name="parport">Enable parallel port for devices which require it</flag>
 		<flag name="qt4">Enable graphical interface using Qt 4</flag>