Workaround for canoscan 2700F problems

5 files changed, 94 insertions, 5 deletions

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 2ef70cd93cfc..81973a03a76f 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,13 +1,13 @@
-MD5 6ddeed01ffcb4d6e6f15f94b575395ab sane-backends-1.0.12-r2.ebuild 1931
+MD5 d74363a9bd108bdcc8b6929d28163ad1 sane-backends-1.0.12-r2.ebuild 1942
 MD5 1b9129be16d6b53693e020df383a43ee sane-backends-1.0.12.ebuild 1302
 MD5 99f2c4bd5ba13f301f86b5402b1186ec sane-backends-1.0.12-r1.ebuild 1836
 MD5 7be7762b50e883335845caf48c8f79fc sane-backends-1.0.8-r2.ebuild 1296
 MD5 f043003a1e14a0d8abd168fe19cc31e3 sane-backends-1.0.9.ebuild 1314
 MD5 7f3b255594838c151d691330cca469d0 sane-backends-1.0.11.ebuild 1309
-MD5 8b1d0239d9606671413d768138ebc93f ChangeLog 3594
-MD5 e4682264e0ab8aaff7687c3f6e81cd18 metadata.xml 338
+MD5 36bc4c35b51c688b33e0c903d33b9c3c ChangeLog 3849
+MD5 e3010e884705ab9dfe82a3663438d36b metadata.xml 383
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
-MD5 302c1d664f4d23e3a79f27ac2918a078 files/canoscan-focus.patch 824
+MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
 MD5 40af2cfe060d09555e45986b2b6b98bd files/digest-sane-backends-1.0.12-r1 143
 MD5 40af2cfe060d09555e45986b2b6b98bd files/digest-sane-backends-1.0.12-r2 143
 MD5 d6110e7bf7bd0c4b8843ca911dea0f6f files/digest-sane-backends-1.0.9 72
diff --git a/media-gfx/sane-backends/files/canoscan-focus.patch b/media-gfx/sane-backends/files/canoscan-focus.patch
new file mode 100644
index 000000000000..43f180aae1b9
--- /dev/null
+++ b/media-gfx/sane-backends/files/canoscan-focus.patch
@@ -0,0 +1,11 @@
+--- backend/canon.c     2003-03-22 17:59:24.000000000 +0100
++++ backend/canon.c.new 2003-09-26 14:07:05.000000000 +0200
+@@ -861,7 +861,7 @@
+       dev->sane.type = "film scanner";
+       dev->adf.Status = ADF_STAT_NONE;
+       dev->tpu.Status = TPU_STAT_NONE;
+-      dev->info.can_focus = SANE_TRUE;
++      dev->info.can_focus = SANE_FALSE;
+       dev->info.can_autoexpose = SANE_FALSE;
+       dev->info.can_calibrate = SANE_FALSE;
+       dev->info.can_eject = SANE_TRUE;
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.12-r2 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.12-r2
new file mode 100644
index 000000000000..d7ed003a2936
--- /dev/null
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.12-r2
@@ -0,0 +1,2 @@
+MD5 28d4d7469cd688dac94c7a415a81a6bb sane-backends-1.0.12.tar.gz 2790931
+MD5 6e64bb52521916cfc3da0d8c26391c03 plustek-0.46-TEST1.tar.gz 129819
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 69009a3f3161..735d2de34d79 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -4,6 +4,6 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>phosphan@gentoo.org</email>
-  <description>No real maintainer, don't even have a scanner. Just looks like I sometimes fix bugs.</description>
+  <description>No real maintainer, don't even have a scanner. Just looks like I sometimes fix bugs. If you want to maintain this, just go ahead.</description>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/sane-backends/sane-backends-1.0.12-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.12-r2.ebuild
new file mode 100644
index 000000000000..f7eecbe6ea04
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.12-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2003 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.12-r2.ebuild,v 1.1 2003/10/08 06:12:28 phosphan Exp $
+
+inherit eutils
+
+IUSE=""
+
+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*"
+
+PLUSTEK_VER="0.46-TEST1"
+
+SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
+	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz
+	http://www.gjaeger.de/scanner/test/plustek-${PLUSTEK_VER}.tar.gz"
+S=${WORKDIR}/${P}
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+
+src_unpack() {
+	unpack ${A}
+	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
+
+	# Update the Plustek driver
+	# the plustek driver 1.1.27t needs to be unpacked inside the
+	# sane-backends directory.
+
+	ebegin "Updating Plustek driver"
+	cd ${S}
+	# the plustek.desc file shipped with the driver does not compile,
+	# this workaround uses the old file from the pristine source instead.
+	cp doc/descriptions/plustek.desc .
+	unpack plustek-${PLUSTEK_VER}.tar.gz
+	cp plustek.desc doc/descriptions/
+
+	# focus problems. See bug 29506
+	epatch ${FILESDIR}/canoscan-focus.patch || die "patch failed"
+
+	cd ${WORKDIR}
+
+	#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:' \
+		${S}/doc/Makefile.in
+}
+
+src_compile() {
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--host=${CHOST} || die
+	make || die
+}
+
+src_install () {
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		mandir=${D}/usr/share/man \
+		docdir=${D}/usr/share/doc/${PF} \
+		install || die
+
+	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
+
+}