Included epson2 related fixes from SANE cvs

Package-Manager: portage-2.1.4.4

4 files changed, 203 insertions, 2 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index c3e66bd1b644..4d9fd4ddfa1d 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.144 2008/06/17 01:19:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.145 2008/08/01 15:18:23 phosphan Exp $
+
+*sane-backends-1.0.19-r2 (01 Aug 2008)
+
+  01 Aug 2008; Patrick Kursawe <phosphan@gentoo.org>
+  +files/epson2fixes-1.0.19.patch, +sane-backends-1.0.19-r2.ebuild:
+  Included epson2 related fixes from SANE cvs
 
   17 Jun 2008; Jeroen Roovers <jer@gentoo.org>
   sane-backends-1.0.19-r1.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 3f09c208d932..059c17dc3254 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,4 +1,5 @@
 AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
+AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e SHA1 daa5e62c01370c788a25448472fc9d5b55abaf9f SHA256 630aa0ed61c8d426f2b06c557a148caaf2ca07d659e97425fd121c5f896dc203
 AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
 AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
 AUX udev-rule-5.patch 1462 RMD160 116e50bff2d00238946595136de535bdd0a747ff SHA1 cdbb5db3fe6c8e5660d86be7391e345ea242ba43 SHA256 edcf1275743ea4e418ec1468f990ad005f55f22bdf8ef143beda04fbbe070b6d
@@ -11,5 +12,6 @@ DIST sane-backends-1.0.19.tar.gz 4293184 RMD160 1aaf304cbfeb3d6c95f6081d04225441
 EBUILD sane-backends-1.0.17.ebuild 3715 RMD160 ce9a3f8f62466f8bb6f540ae0bab66b5adebaf9c SHA1 4897bf1ed36264466820b64fce2e752be71f9c5d SHA256 dd6e223773d9076b89510b87936ade27f74ea2b577e38bce1909073cbaba80d2
 EBUILD sane-backends-1.0.18-r6.ebuild 4246 RMD160 4e823524e867fc1bf701a7905272dcc5d95587b9 SHA1 0f02468ddd8e4d215b35b6cce8ead36e5f41cdec SHA256 92ca0cc05ce40e781329f710cd91f1ded94b544e4b217f837269d7929ba55041
 EBUILD sane-backends-1.0.19-r1.ebuild 4341 RMD160 0b977f32e5f5222205c60f00dff13b66cb70abd9 SHA1 08560315273573bab7def0d97468b25363336c0d SHA256 0cd36987d85374599077168508855d38ec0b09f72a922d2b13bb929bbde405f1
-MISC ChangeLog 24420 RMD160 1ecca615ccefbc6bb78716c6aa2cad3849f0aeb0 SHA1 aeb5af94c86043433ac5e1a67836f5335d2a19a0 SHA256 c304352d6596da49e3d3d15407524790b942271668f3371cd3a5c1b790ca23c4
+EBUILD sane-backends-1.0.19-r2.ebuild 4399 RMD160 826e0f1c8ba6b4546540333eddc0b5a01357f330 SHA1 36225d405beed1e3a9ea8a5b8d4ca13b7a1bd876 SHA256 b63193d89901e723a4c80d34d36a03949799720334db4c6103ce1fffbe8c6e14
+MISC ChangeLog 24633 RMD160 7000eb503a436e786bf1c61a9197406e3cc2a136 SHA1 ff80ce0da8b0d7203e2e3797bc47a789e9570949 SHA256 bc62d74da0d2082475143052540d40283f88328132b1481ffdb5a6ab517ac83b
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
diff --git a/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch b/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch
new file mode 100644
index 000000000000..a32f207f328c
--- /dev/null
+++ b/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch
@@ -0,0 +1,41 @@
+Index: epson2.c
+===================================================================
+RCS file: /cvsroot/sane/sane-backends/backend/epson2.c,v
+retrieving revision 1.15
+retrieving revision 1.17
+diff -u -r1.15 -r1.17
+--- backend/epson2.c	3 Feb 2008 12:09:09 -0000	1.15
++++ backend/epson2.c	3 May 2008 14:43:07 -0000	1.17
+@@ -1243,6 +1243,7 @@
+ 	 *  set dummy values.
+ 	 */
+ 
++	s->fd = -1;
+ 	s->hw = dev;
+ 
+ 	dev->name = NULL;
+@@ -1323,7 +1324,6 @@
+ 		if (status != SANE_STATUS_GOOD) {
+ 			DBG(1, "%s: inquiry failed: %s\n", __func__,
+ 			    sane_strstatus(status));
+-			close_scanner(s);
+ 			goto free;
+ 		}
+ 
+@@ -1534,8 +1534,6 @@
+ 		dev->need_reset_on_source_change = SANE_TRUE;
+ 	}
+ 
+-	close_scanner(s);
+-
+ 	/* we are done with this one, prepare for the next scanner */
+ 	num_devices++;
+ 	dev->next = first_dev;
+@@ -1545,6 +1543,7 @@
+ 		*devp = dev;
+ 
+       free:
++      	close_scanner(s);
+ 	free(s);
+ 	return status;
+ }
diff --git a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
new file mode 100644
index 000000000000..ff5a78cda482
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2008 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.19-r2.ebuild,v 1.1 2008/08/01 15:18:23 phosphan Exp $
+
+inherit eutils
+
+IUSE="usb gphoto2 ipv6 v4l doc"
+
+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}
+	doc? (
+		|| ( app-text/tetex
+				(
+					app-text/texlive
+					dev-texlive/texlive-latexextra
+				)
+			)
+	)
+	>=sys-apps/sed-4"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+BROTHERMFCPATCHVER="1.0.19"
+BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
+
+# 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
+	usb? ( 	mirror://gentoo/${BROTHERMFCDRIVER}.bz2
+			http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~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 epjitsu
+# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
+# microtek2 mustek mustek_usb nec pie pixma plustek_pp
+# ricoh s9036 sceptre sharp
+# sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u
+# artec_eplus48u ma1509 ibm hs2p hp5400 u12 snapscan niash sm3840 hp4200
+# sm3600 hp3500 stv680 epson2 hp5590 hp3900 hpljm1005"
+
+# Note that some backends has specific dependencies which make the compilation
+# fail because not supported on your current platform.
+
+pkg_setup() {
+	enewgroup scanner
+
+	if [[ "${SANE_BACKENDS}" != "" ]]; then
+		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
+		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
+	fi
+	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
+	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}"
+
+	if ! use doc; then
+		sed -i -e 's:@USE_LATEX@:no:' doc/Makefile.in
+	fi
+
+	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-5.patch
+	epatch "${FILESDIR}"/fujitsu_DBG_LEVEL.patch
+	epatch "${FILESDIR}"/epson2fixes-"${PV}".patch
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	EOF
+}
+
+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 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
+}