Fixing udev rules once more, see bug #293453.

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

4 files changed, 263 insertions, 2 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 46a5fd0afa5a..f20035edeac9 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.164 2009/07/19 10:47:47 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.165 2009/11/22 20:22:19 phosphan Exp $
+
+*sane-backends-1.0.20-r2 (22 Nov 2009)
+
+  22 Nov 2009; Patrick Kursawe <phosphan@gentoo.org>
+  +sane-backends-1.0.20-r2.ebuild, +files/udev-rule-6.patch:
+  Fixing udev rules once more, see bug #293453.
 
   19 Jul 2009; Patrick Kursawe <phosphan@gentoo.org>
   sane-backends-1.0.20.ebuild, sane-backends-1.0.20-r1.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index b7cfaca8ddfd..d0345e480e86 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -5,6 +5,7 @@ AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162
 AUX parallel-install-1.0.19.patch 1117 RMD160 c6bc5abc5275dea4418f61cdd4dc007a45e12454 SHA1 5b5e9082f39d34d68fdefd5531e257fb7f7bdbda SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f
 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-6.patch 1110 RMD160 7ba35f5338db19ce57892aaee5524bb484167b2a SHA1 0afe81c28310e8c54a5e0b205eae860589281bc8 SHA256 54426af647ea4bcc3f1318aa5aeccfe05637546c4edd592774d9948a8298fa75
 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
@@ -17,7 +18,8 @@ EBUILD sane-backends-1.0.18-r6.ebuild 4278 RMD160 6813867226c83bacea836184ac70cf
 EBUILD sane-backends-1.0.19-r1.ebuild 4376 RMD160 64c5af36b02721e20948f1c6bf69879f7221f8a4 SHA1 f65a57801bea0710c7122de004afa6d52105ae8f SHA256 2d857ae083482603c58557235535638f4f9a9c337d07ae713878da835141b832
 EBUILD sane-backends-1.0.19-r2.ebuild 4482 RMD160 e9139e5efc0c9eadf07b4ed4d88e40e62401246d SHA1 2c15f4318c477c9d959acaf26f026cbb04683991 SHA256 babc258bbfb6cf0edbea22e5b85fd9b2d9f6f0113eddc8471ad545d926b2c7ac
 EBUILD sane-backends-1.0.20-r1.ebuild 4890 RMD160 3ab805e52b20576ca99c20c3c8ba35635dd9cf73 SHA1 319170630c7d14fd58bec772ece2899684943857 SHA256 f439e46382b088646dc0acb793557e16005acdf6f0715768b7983593a4dd11e0
+EBUILD sane-backends-1.0.20-r2.ebuild 4930 RMD160 f2bcae68bead487ac79a7c7f31eea0f7eb37a45e SHA1 480e2769f5b2cca178d79aefde1065ac1ed3392c SHA256 eae21d6799968644dac6311d2a6338700733f9d38eb1b2c4544c80d6da601633
 EBUILD sane-backends-1.0.20.ebuild 4954 RMD160 534176ffa20c9d64f51f7db0c956eefe4717f63c SHA1 8cfb392350b0acae1b22634724241f7422eee7e5 SHA256 be38a77cca37c0b47bacefc8fd1be87868d2adf09107ffda9ef7aaa431deafed
-MISC ChangeLog 27719 RMD160 910e3de91411baf3847ad8a5d8d45b80fe71754a SHA1 0245f62664de221a99276d2883e2f5dbabfc25c3 SHA256 3025f8e3cb87cefeeec49297ab094778884cc7e2fb18a80e7b4ac8535a926990
+MISC ChangeLog 27922 RMD160 4dac5b5423acfded68a31b61e98f8ba672a747e5 SHA1 b303ba196731e12f4ee64d1a5b8910e2a0ac50e1 SHA256 752e769d40bc37079a036f910a7fa2f38211ddc6c0a036690f07bd186c90c218
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 MISC sane-backends-1.0.20.ebuild.orig 5840 RMD160 44dab6329833fdce0e83ddfd4c45d8e041c10000 SHA1 12533963b1d1341059682897a84ceee7a1e7a939 SHA256 3ad8e220b309e0dd72b4d5988e8d5cf1afc92faaed3c727b7ee2c82dbb06613f
diff --git a/media-gfx/sane-backends/files/udev-rule-6.patch b/media-gfx/sane-backends/files/udev-rule-6.patch
new file mode 100644
index 000000000000..46b89e1d82dc
--- /dev/null
+++ b/media-gfx/sane-backends/files/udev-rule-6.patch
@@ -0,0 +1,20 @@
+--- tools/sane-desc.c.orig	2009-04-15 02:47:56.000000000 +0100
++++ tools/sane-desc.c	2009-11-17 11:12:36.000000000 +0000
+@@ -3488,7 +3488,7 @@
+   printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
+   printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
+   printf ("# Generic: SCSI device type 6 indicates a scanner\n");
+-  printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
++  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+   printf ("# Some scanners advertise themselves as SCSI device type 3\n");
+ 
+   while (scsiid)
+@@ -3521,7 +3521,7 @@
+ 	    }
+         }
+       printf ("\n");
+-      printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
++      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
+ 	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
+       scsiid = scsiid->next;
+     }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20-r2.ebuild
new file mode 100644
index 000000000000..c4438b55242d
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.20-r2.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2009 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.20-r2.ebuild,v 1.1 2009/11/22 20:22:19 phosphan Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc25
+	dc210
+	dc240
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpsj5s
+	hpljm1005
+	hs2p
+	ibm
+	leo
+	lexmark
+	ma1509
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	pie
+	pixma
+	plustek
+	plustek_pp
+	qcam
+	ricoh
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax_pp
+	umax1220u
+	xerox_mfp"
+
+IUSE="avahi usb gphoto2 ipv6 v4l doc"
+
+for backend in ${IUSE_SANE_BACKENDS}; do
+	IUSE="${IUSE} +sane_backends_${backend}"
+done
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+
+RDEPEND="
+	sane_backends_dc210? ( >=media-libs/jpeg-6b )
+	sane_backends_dc240? ( >=media-libs/jpeg-6b )
+	sane_backends_dell1600n_net? ( >=media-libs/jpeg-6b )
+	avahi? ( >=net-dns/avahi-0.6.24 )
+	x86? (
+		sane_backends_canon_pp? ( sys-libs/libieee1284 )
+		sane_backends_hpsj5s? ( sys-libs/libieee1284 )
+		sane_backends_mustek_pp? ( sys-libs/libieee1284 )
+		)
+	amd64? (
+		sane_backends_canon_pp? ( sys-libs/libieee1284 )
+		sane_backends_hpsj5s? ( sys-libs/libieee1284 )
+		sane_backends_mustek_pp? ( sys-libs/libieee1284 )
+		)
+		usb? ( virtual/libusb:0 )
+	gphoto2? (
+				media-libs/libgphoto2
+				>=media-libs/jpeg-6b
+			)
+	v4l? ( sys-kernel/linux-headers
+			arm? ( media-libs/libv4l )
+			alpha? ( media-libs/libv4l )
+			amd64? ( media-libs/libv4l )
+			ppc? ( media-libs/libv4l )
+			ppc64? ( media-libs/libv4l )
+			x86? ( media-libs/libv4l )
+			)"
+
+DEPEND="${RDEPEND}
+	doc? (
+		virtual/latex-base
+		|| ( dev-texlive/texlive-latexextra app-text/tetex app-text/ptex )
+	)
+	>=sys-apps/sed-4"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+# 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"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# the blank is intended - an empty string would result in building ALL backends.
+BACKENDS=" "
+
+pkg_setup() {
+
+	enewgroup scanner
+
+	use gphoto2 && BACKENDS="gphoto2"
+	use v4l && BACKENDS="${BACKENDS} v4l"
+	for backend in ${IUSE_SANE_BACKENDS}; do
+		if use "sane_backends_${backend}"; then
+			BACKENDS="${BACKENDS} ${backend}"
+		fi
+	done
+	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
+	if ! use x86 && ! use amd64; then
+		tmp="${IUSE_SANE_BACKENDS}"
+		for backend in ${IEEE1284_BACKENDS}; do
+			if [[ "${tmp/$backend/}" != "${IUSE_SANE_BACKENDS}" ]]; then
+				ewarn "You selected a backend which is disabled because it's not usable in your arch."
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	EOF
+	epatch "${FILESDIR}/${PV}-unbreak-udev.diff"
+	epatch "${FILESDIR}/udev-rule-6.patch"
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	myconf=$(use_enable usb libusb)
+	if ! use doc; then
+		myconf="${myconf} --disable-latex"
+	fi
+	if use sane_backends_mustek_pp; then
+		myconf="${myconf} --enable-parport-directio"
+	fi
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${BACKENDS}" econf \
+		$(use_with gphoto2) \
+		$(use_enable ipv6) \
+		$(use_enable avahi) \
+		${myconf} || die "econf failed"
+
+	emake VARTEXFONTS="${T}/fonts" || 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
+}