Fix cups usb backend path, bug 435188

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 36 insertions, 18 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index faef4433433b..f2fb759d7d98 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.49 2013/03/24 19:32:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.50 2013/03/24 19:50:36 dilfridge Exp $
+
+  24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/foo2zjs-usbbackend.patch, foo2zjs-99999999.ebuild:
+  Fix cups usb backend path, bug 435188
 
   24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   foo2zjs-99999999.ebuild:
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 7de6c2049e99..af7254ee0113 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA256
 
 AUX foo2zjs-udev.patch 379 SHA256 8961b787e37daaec84d90a9e65a20782177f4483b80669f86e427de967035dfb SHA512 91810416934e0d92ca7717262bfed26fbf275b6193bc236566f2b7b6f34a1a38ab98f0b1a3e074b16f8e3822d67e3d4bf8b8e4562f3e6155090ae1dc82abb8f9 WHIRLPOOL 821d64bbe78ca0de790db03066e84fccf4a659d68e439a984d9446276b56d28802054b23d9132b5cb9d289809af88814a1fcedf50a52a9e4d906f7abb08ee6e9
-EBUILD foo2zjs-99999999.ebuild 1525 SHA256 d61fc3ff891e9a3701165be09fcbb745a08b611ac05fcfa35dac98ee9b0a27b4 SHA512 8d4a9c441b00c849a5c4100d89b6d08984daea10498ab8128258655ab55560e4fc760cf20b508c03e46e9d28ccfad2fbb13b310a15f4fb9e40e8ebcfb3601e35 WHIRLPOOL e0d80e19798710dfa7e86f8a4f54d1af0ca381e30d834990ac4292d1f5ea643ca6a844dbadda48e0726fe7d30e260a5ea4b3f925f96eb0843522b65bb0a4188c
-MISC ChangeLog 10755 SHA256 7f4fd1a1035323c0fe31cc1a3767968442c6cd9d24311802bb6815aeca211b8b SHA512 25c2053ef8e7cabe85e80df1bfc9d845bef30aa998e36981127ec161978f44c56dd3ae1cf2e115c7ea9556ebbdfeafd0f5a84e5a66067a77df701b4bcfb214a4 WHIRLPOOL 37463b2725cfc40b46492d88326a4349f2c1ab1cd358aafdcf0ab84cce2cd90b47982f4461a048343cebff4faec610d2793335b5d4f6b04fa890685f5f7e8e03
+AUX foo2zjs-usbbackend.patch 479 SHA256 8cea95f51d82d7dde5883081b37014565a749074ef87c61ed8a446b916ca1297 SHA512 a37b3bc193a619992a2a0c24f947d96185919cab6f2cb61c0dcc76d942274ea2eb7c325bc960e05cf9ee8969ef17361ab45053a6932d601fe0f68ee19808395c WHIRLPOOL b7413e63bca2041bc233d202563f3a152c6be37a078a0444f4eb23a1c9e57a8db70da153171121a91c9f769c30570863418934a8aab2a26f04945cf1bcddec4e
+EBUILD foo2zjs-99999999.ebuild 1571 SHA256 08905c3988412a212ff48b5a9d476c2be3e5446c5c391b8cabb88cf7fe0531b1 SHA512 1e95cb1c2fc17aaa6690138452cd26fab7938609c376e6dac8309f7352fb8f970cb4fdef8bae3b6613e2663b8e42a8816ac82c7ce40965e478a3d3c8eda11a2e WHIRLPOOL 6e556f244cdfe8b34b5c8b821ff47b2867ed3e3548e8cb08e8a901e5b926a95d7a7ed812c46d41d69e2e687a94f40d14221c685cb7da348c61a1c7057d609f4f
+MISC ChangeLog 10913 SHA256 d8c2d2e74ad0d05b0c6f64adafb1afdb8d125c438ac3db434cfce985cf254676 SHA512 d48784da3ae8d88f9d70dc3100e241b55bd32794a5427236123cb117dd7628e82dc39aa2f649507dd883b2851f90555dc4402875d67b20d0cc3565cfcd4ffedb WHIRLPOOL 66c2f0de932326adbe9e9508999c48b69d18dc7390fd6991d087d55a268b64df5fdb1deb5d222147a8684ed335dd3dadb31a2079d2555b456bcc8c92590f56dc
 MISC metadata.xml 163 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8 SHA512 f030437b07f068562e24595f95b79790c2cedb00630e1364c21591bc4334acdec79d8d00ce3e8208ef60bea8685454bb8994c6c3d9f7f6c1687d2c20fbefd437 WHIRLPOOL 4c265ff911c6d2361c5d5303c3322bcabd8c87fa4f39ad36db069bfe176c34a11ecef1c01c6a3907daf724c7c79796bcb831fed06f4ee0feae145fb716e130e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRT1UPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRT1k/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc45QQAK7CXplMBHSOxir3Pn7Yj8s3
-W5c7a+MODERipvbYfL9H8Yw0pGU7KOvlhEdFBZledA85o/0ONSbioU5EOloSBUUI
-auY9p/blgjMoQvd+pwVlj5O3ryk4R3B2UZEi9O4dsq+KDeUNNfCxEFAeZj8+N0bT
-oOURm9c/bMFmp5muTQS/T1Z31spz0V2a0cpC2WxmWr25QTc+UwlqBU3V5NzYv9iq
-aqpLVjbN5H1fCbVtLnluRFlNL/gQJzUlj9CoDWjflyGpJO1ebj65nQSU//DjbKrl
-xByclpSZUNYDhAS99T6NQrLynErD9Ech10IO5P5dv3wdKeAMgcsTXiYWcIwlvnDd
-Y7lrueee9SziZTPuUkFYNQ/kLJUreUDfgSrcObXMV3kcobNVl7nV3bf+jgH7jyYM
-6IwKe6rir7ebYHDFSaQFPEZsq3SqrFbZ4pG215gPY6jFRK9IHZHIYx9yBS4M7+2M
-MZbauwufjFM6FbmSBUF/Q898mq8Kc0fJsCqHJzoXBdzmKjfuXUdwCMsWVG36NR0e
-3ZpZm+Y0Dy0oxu576yCsTPHDbGdPm2rK7K8aH/tNeloDfV+1o/bYYaofQPYo5sTI
-5ffxiXcg7Z7EM+SFpGvGy0G+oT+8iphVYUnw1LYbAlfkNgwM10TB0qhZMxqFGiYj
-vJcY0hN2ILL+OLyUPszS
-=6rz9
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcVdAP/2L2/pZ+lxnZHiExMTlC8DwF
+x6JbRjxykrxkiUYLBVTXnCAyvOfAYP73PzzFgD8zYpgvvUUfyiYN2NF7pnuhPlTm
+tw+G6awrHaAiOQeoajFaGJpcNfKpjq+VDUN7fgz3aoipyLgRVteEWpuIKtiLcyoo
+NfZamjgBB6JVlbXAGxAa/ERLsPyOTypK8bu1gXa0VydzHSO/l2W3+h6/Zz3AMG4c
+pyCXvVEdXyzUpKyiqnP25wbXuMnMxbxr24YSz39nlq4TiGotQQgapxUBkgf/qils
+iqyLQlkCe19wL1hOafVIrel57bqb//AlFgmyTS2qtUwd3mHrj4yv2JhlWOQsUC6I
+yRNPxy6UHqHWsDwDYWSOQlMNrX8BrL7Ho0wpSaIbd5hr4UhW0mvUsiKVEm1jiPoi
+KC/kjJBh8BC2mU1npsWk0+IHuFWMw4s2J1AagwIoUzNGNL9/mJCCRxLlWCP0NToB
+LfHS0V1ZDaLkvHK4sC4Y48ERA/xJ2THsu2zkLZ+5pYZnTFc1mMmk0jBqyS1CN4Q5
+MYlnubGRJs7Ow3QjJdigLUUo3YsiUq2inGgAYvnukRF7FBqJDpeJs/vg3H4cpxNQ
+/R0CrdrLy0cPdnRgzurs8G0GK5pD7+yxOgHaAvjGWqd8Rq2ApPXjWZttSTUcsojb
+/xDjeHgyrd62BZ2e3qPi
+=8B02
 -----END PGP SIGNATURE-----
diff --git a/net-print/foo2zjs/files/foo2zjs-usbbackend.patch b/net-print/foo2zjs/files/foo2zjs-usbbackend.patch
new file mode 100644
index 000000000000..b73c79be4e56
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-usbbackend.patch
@@ -0,0 +1,12 @@
+diff -ruN foo2zjs.orig/hplj1000 foo2zjs/hplj1000
+--- foo2zjs.orig/hplj1000	2013-01-11 17:20:04.000000000 +0100
++++ foo2zjs/hplj1000	2013-03-24 20:49:16.150065578 +0100
+@@ -42,7 +42,7 @@
+ # Path to the USB CUPS backend. We use this backend to upload the firmware
+ # into the printer when we are on a CUPS/libusb-based system.
+ #
+-USB_BACKEND=/usr/lib/cups/backend/usb
++USB_BACKEND=/usr/libexec/cups/backend/usb
+ 
+ #
+ # Directory to find downloadable HP firmware files sihpMMMM.dl
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index 6b36fd1d7b93..7b021eba6209 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-99999999.ebuild,v 1.9 2013/03/24 19:32:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-99999999.ebuild,v 1.10 2013/03/24 19:50:36 dilfridge Exp $
 
 EAPI="4"
 
@@ -36,6 +36,7 @@ src_unpack() {
 	tar zxf "${WORKDIR}/${PN}.tar.gz"
 
 	epatch "${FILESDIR}/${PN}-udev.patch"
+	epatch "${FILESDIR}/${PN}-usbbackend.patch"
 
 	cd "${S}"