Fixing #59760 (NIASH based scanner support)

5 files changed, 130 insertions, 9 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 59ed3020c394..4f3c034693bc 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.44 2004/07/31 02:54:09 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.45 2004/08/18 07:35:41 phosphan Exp $
+
+*sane-backends-1.0.14-r4 (18 Aug 2004)
+
+  18 Aug 2004; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.14-r3.ebuild, +sane-backends-1.0.14-r4.ebuild:
+  Adding support for NIASH based scanners, see bug #50760. Thanks Jose!
+  Declaring -r3 stable for x86.
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> sane-backends-1.0.14-r3.ebuild:
   stable on ppc64, bug #57131
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 93fbd7b84c6c..2284a8d8f409 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,12 +1,14 @@
-MD5 f95e239fc0fd401bbf315b4adfe7cb77 ChangeLog 7994
-MD5 e3010e884705ab9dfe82a3663438d36b metadata.xml 383
+MD5 5d0ef3a237d4a3afd9441fe30b3642ff sane-backends-1.0.14-r3.ebuild 2477
 MD5 41ccd3ca88b24476e6d95ef32d5f5111 sane-backends-1.0.13-r3.ebuild 1717
 MD5 a7bbc0f5e148d654966c95c15d921fa1 sane-backends-1.0.14-r2.ebuild 2176
-MD5 f6e30304ef6b1c2f42a6b91fde1806a3 sane-backends-1.0.14-r3.ebuild 2474
+MD5 998c7cff0b6534a14fd02fd89e5cbc0d sane-backends-1.0.14-r4.ebuild 2735
+MD5 94a640223a29dae31cb13c01b91e685d ChangeLog 8262
+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
-MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
-MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
-MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
+MD5 e8109e4fa602f9e29257c4abea88f69d files/digest-sane-backends-1.0.14-r4 229
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r4 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r4
new file mode 100644
index 000000000000..df429dcc0a62
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r4
@@ -0,0 +1,3 @@
+MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777
+MD5 1b2f83dcb5dae520ef845d071bceb4f5 backend-20040723_1.tar.gz 31201
+MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
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
index bdf32f96a3e5..eb5225c4beb9 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.14-r3.ebuild,v 1.9 2004/07/31 02:54:09 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild,v 1.10 2004/08/18 07:35:41 phosphan Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
 	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ppc ppc64"
+KEYWORDS="x86 ~sparc ppc ppc64"
 
 
 src_unpack() {
diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r4.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r4.ebuild
new file mode 100644
index 000000000000..099a2d28a7ff
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.14-r4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2004 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.14-r4.ebuild,v 1.1 2004/08/18 07:35:41 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://sourceforge/hp3300backend/backend-20040723_1.tar.gz )
+	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
+
+
+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
+
+	if use usb; then
+		#patch sane-backends for NIASH chip support
+		einfo "Applying NIASH chip support patch"
+		cd ${WORKDIR}/backend
+		chmod +x patch-sane.sh
+		./patch-sane.sh ${S}
+	fi
+}
+
+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 () {
+
+
+	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
+
+}
+
+pkg_preinst() {
+	enewgroup scanner
+}
+
+pkg_postinst() {
+	if use usb; then
+		einfo "There are some problems with the hotplug script when"
+		einfo "restarting hotplug with some kernel versions."
+		einfo "If you have trouble, please edit"
+		einfo "/etc/hotplug/usb/libusbscanner"
+		einfo "and see bug #50934 for details."
+	fi
+}