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

Package-Manager: portage-2.1.11.9/cvs/Linux i686

4 files changed, 23 insertions, 11 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/Manifest b/net-print/hplip/Manifest
index e7edb81b9f8a..848d2e9422b8 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -16,15 +16,15 @@ DIST hplip-3.12.4.tar.gz 20603723 SHA256 350375c78d79adf635a59a448b27b3fe9ab7ac6
 DIST hplip-3.12.9-patches-2.tar.xz 10328 SHA256 d992fdf42bbcde92de9f4256308b3b35b74e3fcae50704d59eaf26bd2beab5b4 SHA512 846b9cc96b1eefcbc0960c312a60ab8913b6db109bfa828d19f1e9cdfccc47e193d582767d828437dbebc9ec1c0617a590e8f3f2e744d9f5bddb6056d43fe6a7 WHIRLPOOL 5d63763f11d8f91a6506301ec2c7e37c1f9e5693c83d818f67129a42c7489fd9ed09c0a06f216af72c21f488cefc6f2b455a010fc504e3fc7b12b877190e9d9b
 DIST hplip-3.12.9.tar.gz 21314003 SHA256 e7361b9d6e968ce3306dc438e622a4412156e7c2d71b2a6face5952cf52e23c4 SHA512 bf0f498d7516c4b7653799c043dd6336a620be31680e1419bf09f9fd52492fc92f59e030df5110f89615c16d27ecad0169c83c938651a7fa7257057ccf5d30eb WHIRLPOOL 1059cf4216b60752c4f6da299f2dd86bdb26be7171275107280953225a9d1d729b135ba0f7990a8ed757fd52880612718bd846abb68ecbf61652923db88ca425
 EBUILD hplip-3.12.10.ebuild 6600 SHA256 00bcbdeceead066400f05a382ce893854692444127e730f07855c24666f4a3d6 SHA512 3ce4d33d8a3895898ad5a816c1ecd3888ca43190fd4a4cf83181e955874c938a0af7dbf839b79a4c40e5b4e926ba3d375cd355bbb3cdbbadc2515d89c513160e WHIRLPOOL e48f0589282cb17dfb1f1598f67e2e2f79d4660219ff256bf96949d75eac32e2c28fce8ec6aef763144b8a3e8ad2c80c636f8f9b9ca52385c432ae8af784ca48
-EBUILD hplip-3.12.10a.ebuild 6610 SHA256 f906a2aeee2d109113a3dccd6de7234b327a5b032f93ff4cc8599c328ecdf885 SHA512 b94e7818a7198d9ba3af116e5e8f94f249ca524e2a3bc70992b2d14b59d75dbed26c30e45ee9318eb486fa7ec5fe1770377bd030c11209cd0e97fbed9f4611ba WHIRLPOOL eff88ffa0de52d5861ddc29baf0e3a6d0aef14672457e4dfad5936e47708e7027a7414abac970dc56dd60de63c9dcd94ce0c05b212c50745091b7d6f3b7e7415
+EBUILD hplip-3.12.10a.ebuild 6761 SHA256 7ce99fee16ded640dedacc44a4bd2029f1d4be8db590c4ab4437649a0c6a1037 SHA512 09a731569aad5e32a70b516db0a1eedcf67da7f0ac65778c4e8e25ec271e18fc04ea48a50989b49c12c3834be7a7308fc0e8813c72dbd10f26ae30b1b6b14fd6 WHIRLPOOL 5674d275c52cedf037804efbfe62e7fb9ec1c7fe0442b910283d322a9473a93dfcb3a3532a29e925a9bccec93ea79072ed1e29af4abfe0a862d915d082837386
 EBUILD hplip-3.12.4.ebuild 6419 SHA256 ca2de34f09f990df2af5d7ac9a0e24c7a6368eaf65400bdb35da0d7742095f85 SHA512 032d6368162c66a971e892d53429ad36f7e605ab5103a0aa57bf563661f909fda80a16c8651c489211b74df3caa218eadc682e3d0e4dd2b733aaaf606edd2229 WHIRLPOOL cc71a7703c7838dde94346c0a255999a3e5f478db634056a7a56f7512488a089356d047bf3f09c5ba891bf596bc14a2ec67f18808b0bfdb24225963e293e31c5
 EBUILD hplip-3.12.9-r1.ebuild 6602 SHA256 41a95901b6d7681d1d97f63eb5b639a27de11718ef7a07d2528e53331db9ef99 SHA512 e57cbf93af83609630aac55e1c7259d431104cc4f9076e078da8a143494edd97669843d1363770ad5a0d1cb579bac5e45a6d981d4673552010ba00570bb1a182 WHIRLPOOL a4cbc84a2a52dad90b518b1b892335bddbcbd0d9b6e7aea4106bae9b916872407b94b546b750fd014d3efeea6963b34ef98dd48ced30ddcd9dafa49b693addeb
-MISC ChangeLog 42634 SHA256 d6bc27aedb1cddc7c79c24b00c823bece6b887e47f6c5ce4d50494aea857b259 SHA512 23262b9a315295b87e14ced267fef71fec6b461bec487cc2a9e2d9002795d2ad7984672c419a20d0e9a4eaef514042e5e714c2e42efc8aa408da8539c847b442 WHIRLPOOL 7ef96c06ff37d0d2d57493d33ebebe45259768e9665a0d18602541d0c2354e41648d62af6f41166659c56406f85e103bcfd7ba7ba15e73dbb75231efae9a81aa
-MISC metadata.xml 1610 SHA256 8f874244f74e21bd6eee94f72feb0a4f2e957be45983a4ef17ab2887bfc9f44f SHA512 75a643ef3a029c3ccf4ebb66e27040a338979fcb59a5cbda801ca0f7d5323b05e37d55394d00f44d5922e2e465677ac2569c0d0b4f5280cb362126087424e762 WHIRLPOOL a4d67347f6f3d25cfc105578493a09dc00c30b8867e387caba797f22267ea183cf9f44934f49a68a950a6bb418439c0aad3ec6476a98ec348d604731483323a9
+MISC ChangeLog 42847 SHA256 b7f3d9a40763b7dbb8cfc0880db09c3b0c44037878cbb1b48cc8c867f0690cd5 SHA512 73bd097af91e67cb5d0055314c518707bfbb8f179c7129401b1ae6622cef1d4a6a15c86728983d0a1b238a3d4f0f49f8a8107bb80793bf8c7ca815ec027dc0a1 WHIRLPOOL c893ef15892ce5bd69737ad8bbbdba48e0732a51edabaf7917b88b21efabedaeba0cded787dd61c0a4ef70846d3a2a39e2e6d6e9480857952ee40653f7c3f8f8
+MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB+I8UACgkQuUQtlDBCeQL9cwCfV6l/PwIcEv52CZAUIAgi+ISg
-RxwAn1csjUwGLwH1KATGbQ7kSydtSnnh
-=U57a
+iEYEAREIAAYFAlCBhmYACgkQlcuUeyFa0U31swCfSqY+KV25/l6+64SVBMeyz3Z6
+XtgAn39s7gqpxGzkBI+k4MMaweCoR1OP
+=OgeW
 -----END PGP SIGNATURE-----
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>