The hotplug script should work for kernel >= 2.6.6 now

5 files changed, 120 insertions, 2 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index efadeb8f50df..88e8b6dd8120 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.37 2004/06/11 10:38:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.38 2004/06/17 16:04:34 phosphan Exp $
+
+*sane-backends-1.0.14-r3 (17 Jun 2004)
+
+  17 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r3.ebuild, files/libusbscanner-device-r1.patch:
+  Should get the right path in /proc from hotplug now.
 
   11 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
   sane-backends-1.0.12-r2.ebuild, sane-backends-1.0.13-r1.ebuild,
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index ec3bf4573096..4dded4d8cce7 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,9 +1,12 @@
+MD5 1a09f19d4598da9f791384e5f74e2299 sane-backends-1.0.14-r3.ebuild 2162
 MD5 d7ba0173d2aadb285b022cbb18de9fee sane-backends-1.0.13-r3.ebuild 1726
 MD5 629d386060bbd002bf33d09826efba55 sane-backends-1.0.14-r2.ebuild 2158
-MD5 c1d9bb51488eafab3634f2850ecc4818 ChangeLog 7144
+MD5 8bd657b2cf5343def272aaa8d8a1cd2c ChangeLog 7364
 MD5 e3010e884705ab9dfe82a3663438d36b metadata.xml 383
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
 MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
 MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
+MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
 MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
 MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r2 160
+MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r3 160
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3
new file mode 100644
index 000000000000..3249e577723f
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3
@@ -0,0 +1,2 @@
+MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777
+MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/libusbscanner-device-r1.patch b/media-gfx/sane-backends/files/libusbscanner-device-r1.patch
new file mode 100644
index 000000000000..ee1891bb411b
--- /dev/null
+++ b/media-gfx/sane-backends/files/libusbscanner-device-r1.patch
@@ -0,0 +1,20 @@
+--- tools/hotplug/libusbscanner	2004-05-10 08:28:34.537782880 +0200
++++ libusbscanner.new	2004-05-10 08:32:05.998691893 +0200
+@@ -13,6 +13,17 @@
+ # DEVICE=/proc/bus/usb/BBB/DDD
+ # TYPE=usb
+ 
++
++if [ -z "${DEVICE}" ] ; then
++        IF=$(echo ${DEVPATH} | sed 's:\(bus/usb/devices/\)\(.*\)-\(.*\):\2:')
++        if [ -r /sys/${DEVPATH}/devnum ]; then
++             DEV=$(cat /sys/${DEVPATH}/devnum)
++        else
++             DEV=1 # you'll have to adjust this manually for kernel < 2.6.6
++        fi
++        DEVICE=$(printf '/proc/bus/usb/%.03d/%.03d' ${IF} ${DEV})
++fi
++
+ if [ "$ACTION" = "add" -a "$TYPE" = "usb" ]; then
+   chown root:scanner "$DEVICE"
+   chmod 0660 "$DEVICE"
diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
new file mode 100644
index 000000000000..ddcfedbede15
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild,v 1.3 2004/06/17 16:04:34 phosphan Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.mostang.com/sane/"
+
+DEPEND=">=media-libs/jpeg-6b
+	x86? ( sys-libs/libieee1284 )
+	=sys-apps/sed-4*
+	usb? ( dev-libs/libusb )
+	gphoto2? ( media-gfx/gphoto2 )"
+
+BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch"
+
+SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
+	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz
+	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~x86"
+
+
+src_unpack() {
+	unpack ${A}
+	use usb && unpack ${BROTHERMFCDRIVER}.bz2
+	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
+
+	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
+	#compile errors when using NDEBUG otherwise
+	sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c
+	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
+	use usb && epatch ${FILESDIR}/libusbscanner-device-r1.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="$(use_enable usb libusb) $(use_with gphoto2)"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--host=${CHOST} ${myconf} || die
+	make || die
+	if use usb; then
+		cd tools/hotplug
+		grep < libsane.usermap -v '^$' > libsane.usermap.new
+		mv libsane.usermap.new libsane.usermap
+	fi
+}
+
+src_install () {
+
+	enewgroup scanner
+
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		mandir=${D}/usr/share/man \
+		docdir=${D}/usr/share/doc/${PF} \
+		install || die
+
+	if use usb; then
+		cd tools/hotplug
+		insinto /etc/hotplug/usb
+		exeinto /etc/hotplug/usb
+		doins libsane.usermap
+		doexe libusbscanner
+		newdoc README README.hotplug
+		cd ../..
+	fi
+
+	docinto backend
+	cd backend
+	dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO
+
+	echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane
+	insinto /etc/env.d
+	doins 30sane
+
+}