sane-backends 1.0.19 is out.

Package-Manager: portage-2.1.3.19

9 files changed, 248 insertions, 45 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 818a1a5eb847..d5626ce9ff42 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.128 2008/01/19 20:09:36 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.129 2008/02/11 10:33:11 phosphan Exp $
+
+*sane-backends-1.0.19 (07 Feb 2008)
+
+  07 Feb 2008; Patrick Kursawe <phosphan@gentoo.org>
+  +files/udev-rule-5.patch, sane-backends-1.0.17.ebuild,
+  sane-backends-1.0.18-r2.ebuild, sane-backends-1.0.18-r3.ebuild,
+  sane-backends-1.0.18-r4.ebuild, sane-backends-1.0.18-r5.ebuild,
+  +sane-backends-1.0.19.ebuild:
+  New version making the coolscan patch obsolete, corrected minor syntax
+  problems for older versions.
 
 *sane-backends-1.0.18-r6 (18 Jan 2008)
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 2a9648a3a2c9..2e6db1355a43 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -2,16 +2,22 @@ AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SH
 AUX udev-rule-2.patch 1765 RMD160 4b228ec772c3089b73d99068f6f97e71cad75e76 SHA1 15766ab0b3e327e8d6e953579bab52d29338dc7c SHA256 1d2f8c6eef9b6aa3860570443d18d7221eab306a16afa38ec1b2eccf4ff5203a
 AUX udev-rule-3.patch 1767 RMD160 f094008db4a500549e95c7bd61288f33cc768e2a SHA1 c7cd2aa717c3a1c8c7d721918026ca01fc03aae8 SHA256 acefdb250f039a672c3d7169a103d6d2543410d4032430a9597a0655a37d0567
 AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
+AUX udev-rule-5.patch 1462 RMD160 116e50bff2d00238946595136de535bdd0a747ff SHA1 cdbb5db3fe6c8e5660d86be7391e345ea242ba43 SHA256 edcf1275743ea4e418ec1468f990ad005f55f22bdf8ef143beda04fbbe070b6d
 AUX udev-rule.patch 1307 RMD160 52db3085e925d2ae47caf15424be35d9c9561fa4 SHA1 887ce0e30d771b11e547ffd5f92be49e8908936c SHA256 8c1419b49933d85a53397e95ac268e11ea864f76a242cc02c604625bfdc5ff54
 DIST sane-1.0.16-brother-driver.diff.bz2 8224 RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f SHA1 2f0cf77d8bbb98b9bb6cc1f56a86f662fa9bda48 SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe
 DIST sane-1.0.18-brother-driver.diff.bz2 8335 RMD160 8d86dccca4054699e367412c25d80d8641de42ca SHA1 60bf9c8d4b2fac3f250a95d1dc8043662fc974cd SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b
+DIST sane-1.0.19-brother-driver.diff.bz2 8192 RMD160 23dc1428cb587b874b31dc385bdc19c9fe8bdb71 SHA1 caa82756d849d5ff4ca9b9af835243df57ee0976 SHA256 cd71eb12e99ea735e524f66fe53e75d8d6f51036242d1326d09296f3b0fdea55
 DIST sane-backends-1.0.17.tar.gz 3588993 RMD160 43e440712e9da676e235dc6148c5dda347c30e22 SHA1 a73e01575458a5fb7dc265cea50c6740555e1711 SHA256 f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77
 DIST sane-backends-1.0.18.tar.gz 3789493 RMD160 aa863adff417d7c33cbb85c193878aa54a056100 SHA1 f4c360b87ced287e4015a0dafd766ad885c539e1 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
-EBUILD sane-backends-1.0.17.ebuild 3840 RMD160 27da2df2529ea54da9312904ff719ecd6321be90 SHA1 28618fe575547073e6314ac2a1c44ef76e28223f SHA256 a115bac3036d5acf960620935ae4e037b03ad018daca517cbe2a48aa6accebda
-EBUILD sane-backends-1.0.18-r2.ebuild 4075 RMD160 dc3776fd4f348e0b1cb4cd0371bae22af8c46460 SHA1 c580fad3f53d21a6664f6f9584ab92e7cead0dae SHA256 a4f8a4df1f3c1111bf9db7fd9c84c9a6fcb1491618da1f23e13ea51e35dc1291
-EBUILD sane-backends-1.0.18-r3.ebuild 4186 RMD160 02aaa929e9f5a0d901acf68311661d5895820e3f SHA1 7455949a248c22c8c546fc5c727526ab5a4c2052 SHA256 8e25ea1ece7f4770369b81c6d2298efdd4555838ffb12ddfb739c784ca1f44ab
-EBUILD sane-backends-1.0.18-r4.ebuild 4179 RMD160 e9e7bb76c4dd362dc4fc4db9f384b706f1d3f3ba SHA1 8af81a9cc5c9e711b938d6cf0df85ad1b8d89692 SHA256 d40e025b2712f5cbf512479fd29820a0936a505b306b3eabfe36db2e2be20437
-EBUILD sane-backends-1.0.18-r5.ebuild 4200 RMD160 70ce6ea4a28421d2fa85ce641a44b71317c742a2 SHA1 0662aecdcadc70aa2472a8fdf41e5539d9524adc SHA256 f33e430d113799625991cd8b137e10bae46801c4cd9074c5eaf1cda29b063f23
+DIST sane-backends-1.0.19.tar.gz 4293184 RMD160 1aaf304cbfeb3d6c95f6081d04225441a87b6644 SHA1 3ff8eefa8f32e72dcdbaa4bf20fe125df90144d5 SHA256 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
+EBUILD sane-backends-1.0.17.ebuild 3837 RMD160 b51986d01aaf238ae3125e8d90467c8a51634131 SHA1 34bda87eca304927443eebebac95cd1df1022f9a SHA256 733cbbfe0927a159654e1eb528d6135b14a1619638788f101d44816970a44122
+EBUILD sane-backends-1.0.18-r2.ebuild 4080 RMD160 aad68de4582c974a6ab30bf352ec74c6be1e4e21 SHA1 e4e12288d230b21cff43b866bfa04e89d80b4604 SHA256 7a2c9b3c1048f2d0bdca1d9b2f08ff4b2e03924d45719634ad5e4d4e355b5c0e
+EBUILD sane-backends-1.0.18-r3.ebuild 4192 RMD160 edb6d54b0be9c121de1c409438102b4e9fc2dfc9 SHA1 0e8da285b44822564a4ae3d4ce9cd3b09b55d88e SHA256 4409a172d9baf09dad285eb468b136c805ab165f17956b9004e8844b11ded568
+EBUILD sane-backends-1.0.18-r4.ebuild 4186 RMD160 5b6123a84c3d271713b428cfe73857e506f088bf SHA1 be4b0e64291e52810ecae84bef85cb9d768f2bf9 SHA256 f3e2f8dd008971a46315a01cdb221ca1394e1ce9be84542c9e7f2a12540a0cea
+EBUILD sane-backends-1.0.18-r5.ebuild 4192 RMD160 1ca4aac2f04c7c310c810d4c516198ce4b9d8cef SHA1 d66526539fa70249be236929bd3689da0b61a4cb SHA256 5628a09f292029318ccdc25c27b95c3e824adad62b5dc97150ce2e8d635564e8
 EBUILD sane-backends-1.0.18-r6.ebuild 4376 RMD160 6e8d86b795bc1d39847733e1578de3a4298aa6a4 SHA1 be371c01a4a4ef8ebaaa39509b9bfe2cc501cbb7 SHA256 05d5f3fa1e4be271d5dbaabfdb1f471b57de48417640a51147106a8e86aa01ff
-MISC ChangeLog 21712 RMD160 a55362f4f5c3b0833e33ba7f235f7cce3507f675 SHA1 f59a198cc928f4bc5b730b772e3989420249c31a SHA256 a362b91237e62736f6a20315f59711fae5bd35b873e49ecbaf52e5748646af01
+EBUILD sane-backends-1.0.19.ebuild 4425 RMD160 241bad954a9b602768ef2d837a61ea717c535c90 SHA1 cef0169c44c08544f2070b2e106ec624d65556e1 SHA256 169efd73d43e4b6d729977570c0ccb7f076f5c7f4bad6cf76075f8119c9fecf4
+MISC ChangeLog 22128 RMD160 f5b9401af94046e1f5384e4780e6417515c61a5a SHA1 528b41a78c4f23cb115228354a3ff93f6102867f SHA256 e19027fe7e75a238e4a3735d7ad61145590aab5c0e30c754b70c7c4e01142b2c
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
+MISC sane-backends-1.0.18-r3.ebuild.orig 4186 RMD160 02aaa929e9f5a0d901acf68311661d5895820e3f SHA1 7455949a248c22c8c546fc5c727526ab5a4c2052 SHA256 8e25ea1ece7f4770369b81c6d2298efdd4555838ffb12ddfb739c784ca1f44ab
+MISC sane-backends-1.0.18-r4.ebuild.orig 4179 RMD160 e9e7bb76c4dd362dc4fc4db9f384b706f1d3f3ba SHA1 8af81a9cc5c9e711b938d6cf0df85ad1b8d89692 SHA256 d40e025b2712f5cbf512479fd29820a0936a505b306b3eabfe36db2e2be20437
diff --git a/media-gfx/sane-backends/files/udev-rule-5.patch b/media-gfx/sane-backends/files/udev-rule-5.patch
new file mode 100644
index 000000000000..6298539d4834
--- /dev/null
+++ b/media-gfx/sane-backends/files/udev-rule-5.patch
@@ -0,0 +1,33 @@
+--- tools/sane-desc.c	2008-02-07 09:09:16.000000000 +0100
++++ tools/sane-desc.c.new	2008-02-07 09:27:19.000000000 +0100
+@@ -3157,7 +3157,7 @@
+ 
+   printf 
+     ("#\n"
+-     "# udev rules file for supported USB devices\n"
++     "# udev rules file for supported USB and SCSI devices\n"
+      "#\n"
+      "# To add a USB device, add a rule to the list below between the\n"
+      "# LABEL=\"libsane_rules_begin\" and LABEL=\"libsane_rules_end\" lines.\n"
+@@ -3180,9 +3180,11 @@
+ 
+   print_udev_header ();
+   printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n"
++	 "SUBSYSTEMS==\"scsi\", ATTRS{type}==\"3|6\", MODE=\"660\", GROUP=\"scanner\"\n"
+ 	 "ENV{DEVTYPE}==\"usb_device\", GOTO=\"libsane_create_usb_dev\"\n"
+ 	 "SUBSYSTEM==\"usb_device\", GOTO=\"libsane_rules_begin\"\n"
+-	 "SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n"
++	 "SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libsane_rules_end\"\n"
++	 "SUBSYSTEM==\"usb\", ENV{DEVTYPE}!=\"usb_device\" ,GOTO=\"libsane_rules_end\"\n"
+ 	 "\n");
+ 
+   printf("# Kernel >= 2.6.22 jumps here\n"
+@@ -3226,7 +3228,7 @@
+ 	    }
+ 	}
+       printf ("\n");
+-      printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"0664\", GROUP=\"scanner\", ENV{libsane_matched}=\"yes\"\n",
++      printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"0664\", GROUP=\"scanner\", ENV{libsane_matched}=\"yes\"\n",
+ 	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
+       usbid = usbid->next;
+     }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.17.ebuild b/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
index 50fadc417ce5..dd83e7354e21 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.17.ebuild,v 1.13 2007/06/26 02:11:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.17.ebuild,v 1.14 2008/02/11 10:33:11 phosphan Exp $
 
 inherit eutils
 
@@ -76,7 +76,7 @@ src_unpack() {
 		unpack ${BROTHERMFCDRIVER}.bz2
 	fi
 
-	cd ${S}
+	cd "${S}"
 
 	#only generate the .ps and not the fonts
 	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
@@ -86,7 +86,7 @@ src_unpack() {
 		|| die "function_name fix failed"
 
 	if use usb; then
-		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
 		sed -e 's/bh canon/bh brother canon/' -i configure || \
 			die "could not add 'brother' to backend list"
 	fi
@@ -112,7 +112,7 @@ src_compile() {
 }
 
 src_install () {
-	einstall docdir=${D}/usr/share/doc/${PF}
+	einstall docdir="${D}/usr/share/doc/${PF}"
 	keepdir /var/lib/lock/sane
 	fowners root:scanner /var/lib/lock/sane
 	fperms g+w /var/lib/lock/sane
@@ -126,7 +126,7 @@ src_install () {
 		cd ../..
 	fi
 
-	dodoc NEWS AUTHORS LICENSE ChangeLog* README README.linux
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
 
 	echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane
 	doenvd 30sane
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
index 14720d1d3919..f40db44f3041 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild,v 1.12 2007/06/26 02:11:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild,v 1.13 2008/02/11 10:33:11 phosphan Exp $
 
 inherit eutils
 
@@ -78,19 +78,19 @@ src_unpack() {
 		unpack ${BROTHERMFCDRIVER}.bz2
 	fi
 
-	cd ${S}
+	cd "${S}"
 
 	#only generate the .ps and not the fonts
 	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
 		doc/Makefile.in
 
 	if use usb; then
-		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
 		sed -e 's/bh canon/bh brother canon/' -i configure || \
 			die "could not add 'brother' to backend list"
 	fi
-	epatch ${FILESDIR}/udev-rule.patch
-	epatch ${FILESDIR}/broken_coolscan.patch
+	epatch "${FILESDIR}/udev-rule.patch"
+	epatch "${FILESDIR}/broken_coolscan.patch"
 }
 
 src_compile() {
@@ -113,7 +113,7 @@ src_compile() {
 
 src_install () {
 	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF}
+		docdir="/usr/share/doc/${PF}"
 	keepdir /var/lib/lock/sane
 	fowners root:scanner /var/lib/lock/sane
 	fperms g+w /var/lib/lock/sane
@@ -125,7 +125,7 @@ src_install () {
 		doins libsane.usermap
 		doexe libusbscanner
 		newdoc README README.hotplug
-		echo >> ${D}/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
+		echo >> "${D}/etc/env.d/30sane" "USB_DEVFS_PATH=/dev/bus/usb"
 		cd ../..
 	fi
 	cd tools/udev
@@ -134,6 +134,6 @@ src_install () {
 	newins libsane.rules 99-libsane.rules
 	cd ../..
 
-	dodoc NEWS AUTHORS LICENSE ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> ${D}/etc/env.d/30sane
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}/etc/env.d/30sane"
 }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild
index 1e89f0d161ec..2562e69fda9c 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild,v 1.3 2007/08/21 14:39:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild,v 1.4 2008/02/11 10:33:11 phosphan Exp $
 
 inherit eutils
 
@@ -82,19 +82,19 @@ src_unpack() {
 		unpack ${BROTHERMFCDRIVER}.bz2
 	fi
 
-	cd ${S}
+	cd "${S}"
 
 	#only generate the .ps and not the fonts
 	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
 		doc/Makefile.in
 
 	if use usb; then
-		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
 		sed -e 's/bh canon/bh brother canon/' -i configure || \
 			die "could not add 'brother' to backend list"
 	fi
-	epatch ${FILESDIR}/udev-rule-2.patch
-	epatch ${FILESDIR}/broken_coolscan.patch
+	epatch "${FILESDIR}/udev-rule-2.patch"
+	epatch "${FILESDIR}/broken_coolscan.patch"
 }
 
 src_compile() {
@@ -117,7 +117,7 @@ src_compile() {
 
 src_install () {
 	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF}
+		docdir="/usr/share/doc/${PF}"
 	keepdir /var/lib/lock/sane
 	fowners root:scanner /var/lib/lock/sane
 	fperms g+w /var/lib/lock/sane
@@ -129,7 +129,7 @@ src_install () {
 		doins libsane.usermap
 		doexe libusbscanner
 		newdoc README README.hotplug
-		echo >> ${D}/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
+		echo >> "${D}/etc/env.d/30sane" "USB_DEVFS_PATH=/dev/bus/usb"
 		cd ../..
 	fi
 	cd tools/udev
@@ -138,6 +138,6 @@ src_install () {
 	newins libsane.rules 99-libsane.rules
 	cd ../..
 
-	dodoc NEWS AUTHORS LICENSE ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> ${D}/etc/env.d/30sane
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}/etc/env.d/30sane"
 }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild
index 2d42094f7632..4ff8d4e1ff7e 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild,v 1.7 2007/10/09 08:57:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild,v 1.8 2008/02/11 10:33:11 phosphan Exp $
 
 inherit eutils
 
@@ -82,19 +82,19 @@ src_unpack() {
 		unpack ${BROTHERMFCDRIVER}.bz2
 	fi
 
-	cd ${S}
+	cd "${S}"
 
 	#only generate the .ps and not the fonts
 	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
 		doc/Makefile.in
 
 	if use usb; then
-		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
 		sed -e 's/bh canon/bh brother canon/' -i configure || \
 			die "could not add 'brother' to backend list"
 	fi
-	epatch ${FILESDIR}/udev-rule-3.patch
-	epatch ${FILESDIR}/broken_coolscan.patch
+	epatch "${FILESDIR}/udev-rule-3.patch"
+	epatch "${FILESDIR}/broken_coolscan.patch"
 }
 
 src_compile() {
@@ -117,7 +117,7 @@ src_compile() {
 
 src_install () {
 	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF}
+		docdir="/usr/share/doc/${PF}"
 	keepdir /var/lib/lock/sane
 	fowners root:scanner /var/lib/lock/sane
 	fperms g+w /var/lib/lock/sane
@@ -129,7 +129,7 @@ src_install () {
 		doins libsane.usermap
 		doexe libusbscanner
 		newdoc README README.hotplug
-		echo >> ${D}/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
+		echo >> "${D}/etc/env.d/30sane" "USB_DEVFS_PATH=/dev/bus/usb"
 		cd ../..
 	fi
 	cd tools/udev
@@ -138,6 +138,6 @@ src_install () {
 	newins libsane.rules 99-libsane.rules
 	cd ../..
 
-	dodoc NEWS AUTHORS LICENSE ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> ${D}/etc/env.d/30sane
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}/etc/env.d/30sane"
 }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
index 9e3320dd0bc8..051bd89a1e84 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild,v 1.2 2008/01/18 14:24:56 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild,v 1.3 2008/02/11 10:33:11 phosphan Exp $
 
 inherit eutils
 
@@ -138,6 +138,6 @@ src_install () {
 	newins libsane.rules 70-libsane.rules
 	cd ../..
 
-	dodoc NEWS AUTHORS LICENSE ChangeLog* README README.linux
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
 	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
 }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.19.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19.ebuild
new file mode 100644
index 000000000000..5e42774fc38d
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.19.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19.ebuild,v 1.1 2008/02/11 10:33:11 phosphan Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2 ipv6 v4l doc"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+
+RDEPEND=">=media-libs/jpeg-6b
+	amd64? ( sys-libs/libieee1284 )
+	x86? ( sys-libs/libieee1284 )
+	usb? ( >=dev-libs/libusb-0.1.8 )
+	gphoto2? ( media-libs/libgphoto2 )
+	v4l? ( sys-kernel/linux-headers )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		|| ( app-text/tetex
+				(
+					app-text/texlive
+					dev-texlive/texlive-latexextra
+				)
+			)
+	)
+	>=sys-apps/sed-4"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+BROTHERMFCPATCHVER="1.0.19"
+BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
+
+# Could not access via ftp on 2006-07-20
+SRC_URI="http://alioth.debian.org/frs/download.php/2318/${P}.tar.gz
+	ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
+	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
+	usb? ( 	mirror://gentoo/${BROTHERMFCDRIVER}.bz2
+			http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# To enable specific backends, define SANE_BACKENDS with the backends you want
+# in those:
+# abaton agfafocus apple artec as6e avision bh brother canon
+# canon630u coolscan coolscan2 dc25 dmc epjitsu
+# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
+# microtek2 mustek mustek_usb nec pie pixma plustek_pp
+# ricoh s9036 sceptre sharp
+# sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u
+# artec_eplus48u ma1509 ibm hs2p hp5400 u12 snapscan niash sm3840 hp4200
+# sm3600 hp3500 stv680 epson2 hp5590 hp3900 hpljm1005"
+
+# Note that some backends has specific dependencies which make the compilation
+# fail because not supported on your current platform.
+
+pkg_setup() {
+	enewgroup scanner
+
+	if [[ "${SANE_BACKENDS}" != "" ]]; then
+		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
+		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
+	fi
+	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
+	if ! use x86 && ! use amd64; then
+		tmp="${SANE_BACKENDS}"
+		for backend in ${IEEE1284_BACKENDS}; do
+			if [[ "${tmp/$backend/}" != "${SANE_BACKENDS}" ]]; then
+				ewarn "You selected a backend which is disabled because it's not usable in your arch."
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [ -z "${SANE_BACKENDS}" ]; then
+		elog "You can use the variable SANE_BACKENDS to pick backends"
+		elog "instead of building all of them."
+	fi
+	unpack ${A}
+
+	if use usb; then
+		unpack ${BROTHERMFCDRIVER}.bz2
+	fi
+
+	cd "${S}"
+
+	#only generate the .ps and not the fonts
+	sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \
+		doc/Makefile.in
+
+	if ! use doc; then
+		sed -i -e 's:@USE_LATEX@:no:' doc/Makefile.in
+	fi
+
+	if use usb; then
+		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
+		sed -e 's/bh canon/bh brother canon/' -i configure || \
+			die "could not add 'brother' to backend list"
+	fi
+	epatch "${FILESDIR}"/udev-rule-5.patch
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	#hpaio
+	EOF
+}
+
+src_compile() {
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${SANE_BACKENDS}" \
+	econf \
+		$(use_enable usb libusb) \
+		$(use_with gphoto2) \
+		$(use_enable ipv6) \
+		${myconf} || die "econf failed"
+
+	emake || die
+
+	if use usb; then
+		cd tools/hotplug
+		grep -v '^$' libsane.usermap > libsane.usermap.new
+		mv libsane.usermap.new libsane.usermap
+	fi
+}
+
+src_install () {
+	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir=/usr/share/doc/${PF}
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+	if use usb; then
+		cd tools/hotplug
+		insinto /etc/hotplug/usb
+		exeinto /etc/hotplug/usb
+		doins libsane.usermap
+		doexe libusbscanner
+		newdoc README README.hotplug
+		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
+		cd ../..
+	fi
+	cd tools/udev
+	dodir /etc/udev/rules.d
+	insinto /etc/udev/rules.d
+	newins libsane.rules 70-libsane.rules
+	cd ../..
+	dodoc NEWS AUTHORS ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
+}