Fixed file mode for libusb device nodes (664 as default rules do). Let the udev rules ignore printer devices, Bug #193266. Renamed rules file to 70-libsane.rules.

Package-Manager: portage-2.1.3.11

5 files changed, 236 insertions, 5 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 8033b785c09e..665095214952 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.125 2007/09/05 11:29:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.126 2007/10/05 07:32:03 zzam Exp $
+
+*sane-backends-1.0.18-r5 (05 Oct 2007)
+
+  05 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-rule-4.patch, +sane-backends-1.0.18-r5.ebuild:
+  Fixed file mode for libusb device nodes (664 as default rules do). Let the
+  udev rules ignore printer devices, Bug #193266. Renamed rules file to
+  70-libsane.rules.
 
   05 Sep 2007; Raúl Porcel <armin76@gentoo.org>
   sane-backends-1.0.18-r4.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 0cee1576be26..5abda3234435 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
 MD5 7cf37ee795b044d46571cdf4a52ce8ac files/broken_coolscan.patch 442
 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab files/broken_coolscan.patch 442
@@ -10,6 +13,10 @@ AUX udev-rule-3.patch 1767 RMD160 f094008db4a500549e95c7bd61288f33cc768e2a SHA1
 MD5 7efa065add0e7fcb542dc9b45524c27d files/udev-rule-3.patch 1767
 RMD160 f094008db4a500549e95c7bd61288f33cc768e2a files/udev-rule-3.patch 1767
 SHA256 acefdb250f039a672c3d7169a103d6d2543410d4032430a9597a0655a37d0567 files/udev-rule-3.patch 1767
+AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
+MD5 5dcb9880572e5b1dbd1c8857602d2b6a files/udev-rule-4.patch 1861
+RMD160 eb841e97e2729dd7645df9261178d1f644b20032 files/udev-rule-4.patch 1861
+SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c files/udev-rule-4.patch 1861
 AUX udev-rule.patch 1307 RMD160 52db3085e925d2ae47caf15424be35d9c9561fa4 SHA1 887ce0e30d771b11e547ffd5f92be49e8908936c SHA256 8c1419b49933d85a53397e95ac268e11ea864f76a242cc02c604625bfdc5ff54
 MD5 8d2c305dee317a0b715918c211de9719 files/udev-rule.patch 1307
 RMD160 52db3085e925d2ae47caf15424be35d9c9561fa4 files/udev-rule.patch 1307
@@ -34,10 +41,14 @@ EBUILD sane-backends-1.0.18-r4.ebuild 4180 RMD160 2ae709ce278f32ad63d6f6c19657f3
 MD5 10572fc08b0de25e97b020c76d7f4b8d sane-backends-1.0.18-r4.ebuild 4180
 RMD160 2ae709ce278f32ad63d6f6c19657f3c1777cf1b9 sane-backends-1.0.18-r4.ebuild 4180
 SHA256 2e0ef682832151885bcd5a7f88266d9657aec05f22d45c7eda2affe141cb7afa sane-backends-1.0.18-r4.ebuild 4180
-MISC ChangeLog 21090 RMD160 1eef7b6f0116eeb84f476f60e4ad5d86a1ca536a SHA1 cfbdabf4abc4bbee846b298def98383998067974 SHA256 b58e4bee2c70d29caeb0a5f9d4c36683339625d43d309cec03fbedbb1286ee37
-MD5 4eb8b2b0f340fc9eae9a955b4694a398 ChangeLog 21090
-RMD160 1eef7b6f0116eeb84f476f60e4ad5d86a1ca536a ChangeLog 21090
-SHA256 b58e4bee2c70d29caeb0a5f9d4c36683339625d43d309cec03fbedbb1286ee37 ChangeLog 21090
+EBUILD sane-backends-1.0.18-r5.ebuild 4196 RMD160 08d61a509a3a7cb722b529a85c125bbf9ed57343 SHA1 0fa41e0997e4b4198855396ab7da72a90024cc6d SHA256 1c5999bfa7192bf75bda5ef092a8ec086796cf63ebe7ed8acedca0927d27ec9b
+MD5 728b5a513468d0b14b3f195fdb4cca78 sane-backends-1.0.18-r5.ebuild 4196
+RMD160 08d61a509a3a7cb722b529a85c125bbf9ed57343 sane-backends-1.0.18-r5.ebuild 4196
+SHA256 1c5999bfa7192bf75bda5ef092a8ec086796cf63ebe7ed8acedca0927d27ec9b sane-backends-1.0.18-r5.ebuild 4196
+MISC ChangeLog 21411 RMD160 d875f2cda9e98e1826990f450e13fa889f5d604e SHA1 33845bde6d4c144e0e28d0a69b16e8fa81421b19 SHA256 73c14f57fb97f23013095ee0c4a24cdff9fa7e396024ff8441429009c63b4b57
+MD5 c1bc1f9f8d444dce5ba885d862a2547a ChangeLog 21411
+RMD160 d875f2cda9e98e1826990f450e13fa889f5d604e ChangeLog 21411
+SHA256 73c14f57fb97f23013095ee0c4a24cdff9fa7e396024ff8441429009c63b4b57 ChangeLog 21411
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 RMD160 d646bef174a902fd1910871e794292c44f292052 metadata.xml 224
@@ -54,3 +65,13 @@ SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/di
 MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18-r4 545
 RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18-r4 545
 SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18-r4 545
+MD5 a5adbad07b9aed2a03f518664e2d94e6 files/digest-sane-backends-1.0.18-r5 545
+RMD160 b2327e4254ffcf2074c21f2b1c629014ab83ed14 files/digest-sane-backends-1.0.18-r5 545
+SHA256 64854e40d74b4a1b27aea1b2f5b5accdd348b8a835e9d8898b6f3dc5904f19a8 files/digest-sane-backends-1.0.18-r5 545
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHBeh8t2vP6XvVdOcRApm3AKDCdivcmJJxgjlpE2BlbXEg99zSZQCfdlwF
+OqZZoV+rG66cHieLoIV5PwA=
+=Cwol
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r5 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r5
new file mode 100644
index 000000000000..5242a0c5bacf
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.18-r5
@@ -0,0 +1,6 @@
+MD5 69b18ea038b8cd0e289c04c512b43b8e sane-1.0.18-brother-driver.diff.bz2 8335
+RMD160 8d86dccca4054699e367412c25d80d8641de42ca sane-1.0.18-brother-driver.diff.bz2 8335
+SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b sane-1.0.18-brother-driver.diff.bz2 8335
+MD5 7ca7e2908e24721471de92cf40c75e60 sane-backends-1.0.18.tar.gz 3789493
+RMD160 aa863adff417d7c33cbb85c193878aa54a056100 sane-backends-1.0.18.tar.gz 3789493
+SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3 sane-backends-1.0.18.tar.gz 3789493
diff --git a/media-gfx/sane-backends/files/udev-rule-4.patch b/media-gfx/sane-backends/files/udev-rule-4.patch
new file mode 100644
index 000000000000..3d824d162cb6
--- /dev/null
+++ b/media-gfx/sane-backends/files/udev-rule-4.patch
@@ -0,0 +1,53 @@
+Index: tools/sane-desc.c
+===================================================================
+--- tools/sane-desc.c.orig
++++ tools/sane-desc.c
+@@ -3151,7 +3151,7 @@ print_udev_header (void)
+ 
+   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 SUBSYSTEM...\n"
+      "# and LABEL... lines.\n"
+@@ -3169,25 +3169,33 @@ print_udev_header (void)
+ static void
+ print_udev (void)
+ {
++  int commentlen;
+   usbid_type *usbid = create_usbids_table ();
+ 
+   print_udev_header ();
+   printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
+-  printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
++  puts("SUBSYSTEMS==\"scsi\", ATTRS{type}==\"6\", MODE=\"660\", GROUP=\"scanner\"");
++  printf ("SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libsane_rules_end\"\n");
++  printf ("SUBSYSTEM==\"usb\", ENV{DEVTYPE}!=\"usb_device\" ,GOTO=\"libsane_rules_end\"\n\n");
+   while (usbid)
+     {
+       manufacturer_model_type * name = usbid->name;
+ 
+-      printf ("# ");
++      commentlen = printf ("# ");
+       while (name)
+ 	{
+-	  if (name != usbid->name)
+-	    printf (" | ");
+-	  printf ("%s", name->name);
++	  if (name != usbid->name) {
++	    commentlen += printf (" | ");
++	  }  
++	  if(commentlen + strlen(name->name) > 480) {
++		  printf(" (line too long, names omitted)");
++		  break;
++	  }
++	  commentlen += printf ("%s", name->name);
+ 	  name = name->next;
+ 	}
+       printf ("\n");
+-      printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
++      printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"664\", GROUP=\"scanner\"\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.18-r5.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
new file mode 100644
index 000000000000..1f7d9cc37b8f
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2007 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.1 2007/10/05 07:32:03 zzam Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2 ipv6 v4l"
+
+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}
+	>=sys-apps/sed-4"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+BROTHERMFCPATCHVER="1.0.18"
+BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
+
+# Could not access via ftp on 2006-07-20
+SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.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
+# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
+# microtek2 mustek mustek_usb nec pie pixma plustek
+# plustek_pp ricoh s9036 sceptre sharp
+# sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u
+# artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840 hp4200
+# sm3600 hp3500 stv680"
+
+# Note that some backends has specific dependencies which make the compilation
+# fail because not supported on your current platform.
+
+pkg_setup() {
+	enewgroup scanner
+
+	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
+
+	if [[ "${SANE_BACKENDS}" != "" ]]; then
+		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
+		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
+		use usb && SANE_BACKENDS="${SANE_BACKENDS} sm3600"
+	fi
+
+	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 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-4.patch
+	epatch "${FILESDIR}"/broken_coolscan.patch
+}
+
+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 LICENSE ChangeLog* README README.linux
+	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
+}