Non-maintainer commit: backport upstream fix for >=media-libs/libv4l-0.8.3 support, bug #356919. Also remove leftover app-text/tetex dependencies

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

8 files changed, 69 insertions, 1345 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 2ac4e99e85a7..1ced521f12a3 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,901 +1,12 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.184 2011/05/19 22:53:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.185 2011/08/05 09:31:25 voyageur Exp $
 
-*sane-backends-1.0.22-r1 (19 May 2011)
+  05 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  sane-backends-1.0.20-r3.ebuild, -sane-backends-1.0.21.ebuild,
+  sane-backends-1.0.21-r1.ebuild, -sane-backends-1.0.22.ebuild,
+  sane-backends-1.0.22-r1.ebuild,
+  +files/sane-backends-1.0.22-libv4l-0.8.3.patch:
+  Non-maintainer commit: backport upstream fix for >=media-libs/libv4l-0.8.3
+  support, bug #356919. Also remove leftover app-text/tetex dependencies
 
-  19 May 2011; Bernard Cafarelli <voyageur@gentoo.org>
-  +sane-backends-1.0.22-r1.ebuild,
-  +files/sane-backends-1.0.22-xerox_mfp-usb.patch:
-  Non-maintainer commit: fix xerox_mfp USB support, bug #368083, and use
-  src_prepare
-
-*sane-backends-1.0.22 (08 May 2011)
-
-  08 May 2011; Diego E. Pettenò <flameeyes@gentoo.org>
-  +sane-backends-1.0.22.ebuild:
-  Non-maintainer version bump for sane-backends-1.0.22, see bug #355827. Add
-  similar comments for epkowa as it is done with hplip; use emake for install;
-  port to EAPI=4; avoid changing directories so often.
-
-  25 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  sane-backends-1.0.21-r1.ebuild:
-  ppc/ppc64 stable wrt #330855
-
-  19 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  sane-backends-1.0.21-r1.ebuild:
-  QA: drop non-existing dependency from || clausule. Remove needless die.
-  Whitespace.
-
-  30 Jan 2011; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.21-r1.ebuild:
-  alpha/arm/ia64/sparc stable wrt #330855
-
-  28 Jan 2011; Jeroen Roovers <jer@gentoo.org> sane-backends-1.0.21-r1.ebuild:
-  Stable for HPPA (bug #330855).
-
-  27 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
-  sane-backends-1.0.21-r1.ebuild:
-  stable x86, bug 330855
-
-  25 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
-  sane-backends-1.0.21-r1.ebuild:
-  Stable on amd64 wrt bug #330855
-
-  21 Jan 2011; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild, sane-backends-1.0.19-r2.ebuild,
-  sane-backends-1.0.20-r3.ebuild, sane-backends-1.0.21.ebuild,
-  sane-backends-1.0.21-r1.ebuild:
-  Changing udev rules installation directory to $(get_libdir)/udev/rules.d, see bug #
-  348706.
-
-  16 Nov 2010; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.17.ebuild, sane-backends-1.0.18-r6.ebuild,
-  sane-backends-1.0.19-r2.ebuild, sane-backends-1.0.20-r3.ebuild,
-  sane-backends-1.0.21.ebuild, sane-backends-1.0.21-r1.ebuild:
-  Moving to virtual/jpeg.
-
-  01 Sep 2010; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.21-r1.ebuild, +files/xerox-grey.patch:
-  Little fix for missing colors when using xerox_mfp, bug #332667.
-
-*sane-backends-1.0.21-r1 (01 Sep 2010)
-
-  01 Sep 2010; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.21-r1.ebuild:
-  Bug #322291: udev rules were overwritten by defaults.
-
-  11 May 2010; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.21.ebuild:
-  Fixed one of the SRC_URIs
-
-*sane-backends-1.0.21 (11 May 2010)
-
-  11 May 2010; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.21.ebuild:
-  Version bump, see bug #317749. Renamed the udev rules file, see bug
-  #316909.
-
-  02 Apr 2010; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.20-r3.ebuild:
-  libieee1284 was always linked with, see bug #283341.
-
-  09 Mar 2010; Patrick Kursawe <phosphan@gentoo.org>
-  -sane-backends-1.0.19-r1.ebuild, -sane-backends-1.0.20.ebuild,
-  -sane-backends-1.0.20-r1.ebuild, -sane-backends-1.0.20-r2.ebuild:
-  Removing obsolete revisions.
-
-  14 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
-  sane-backends-1.0.20-r3.ebuild:
-  Fix USE v4l depends so that linux-headers isn't a runtime depend anymore.
-  Also USE v4l is now masked on ia64/sparc so drop the hack from deps.
-
-  14 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
-  sane-backends-1.0.20-r3.ebuild:
-  Remove amd64/x86 check from here because it's been properly handled in
-  profiles.
-
-*sane-backends-1.0.20-r3 (02 Jan 2010)
-
-  02 Jan 2010; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.20-r3.ebuild, +files/genesys_io.patch:
-  Fixing a genesys specific problem, see bug #298578
-
-*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:
-  IUSE/SANE_BACKENDS handling was a bit too clever, see bug #278274
-
-*sane-backends-1.0.20-r1 (17 Jul 2009)
-
-  17 Jul 2009; Patrick Kursawe <phosphan@gentoo.org>
-  +files/1.0.20-unbreak-udev.diff, +sane-backends-1.0.20-r1.ebuild:
-  Fixing udev rules, see bug #276486. Fixing flags and dependency 
-  for libusb.
-
-  08 Jul 2009; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.20.ebuild:
-  Fixing configure options for libusb-1, see bug #275485.
-
-*sane-backends-1.0.20 (24 Jun 2009)
-
-  24 Jun 2009; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.20.ebuild:
-  The new version has a changed build system and the ebuild uses USE_EXPAND
-  for SANE_BACKENDS. Bug #244501, bug #271681
-
-  18 Jun 2009; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.17.ebuild, sane-backends-1.0.18-r6.ebuild,
-  sane-backends-1.0.19-r1.ebuild, sane-backends-1.0.19-r2.ebuild:
-  Adjusted libusb dependency according to bug #270039. No testing with
-  libusb-compat possible due to lack of hardware and no code review
-  because of limited time, sorry.
-
-  02 Jun 2009; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.19-r2.ebuild:
-  alpha/sparc stable wrt #269048
-
-  31 May 2009; Brent Baude <ranger@gentoo.org>
-  sane-backends-1.0.19-r2.ebuild:
-  stable ppc64, bug 269048
-
-  30 May 2009; nixnut <nixnut@gentoo.org> sane-backends-1.0.19-r2.ebuild:
-  ppc stable #269048
-
-  30 May 2009; Ulrich Mueller <ulm@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild, sane-backends-1.0.19-r1.ebuild,
-  sane-backends-1.0.19-r2.ebuild:
-  Remove app-text/tetex from dependencies, bug 227443.
-
-  28 May 2009; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.19-r2.ebuild:
-  arm/ia64 stable wrt #269048
-
-  26 May 2009; Jeroen Roovers <jer@gentoo.org>
-  sane-backends-1.0.19-r2.ebuild:
-  Stable for HPPA (bug #269048).
-
-  25 May 2009; Markus Meier <maekke@gentoo.org>
-  sane-backends-1.0.19-r2.ebuild:
-  amd64/x86 stable, bug #269048
-
-  12 Apr 2009; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.19-r2.ebuild:
-  Add ~ia64
-
-  07 Feb 2009; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.17.ebuild, sane-backends-1.0.18-r6.ebuild,
-  sane-backends-1.0.19-r1.ebuild, sane-backends-1.0.19-r2.ebuild:
-  Turning off strict aliasing because of bad upstream code, see bug #253504.
-
-  27 Sep 2008; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.19-r2.ebuild:
-  Add ~arm wrt #237945
-
-  04 Sep 2008; Alexis Ballier <aballier@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild, sane-backends-1.0.19-r1.ebuild,
-  sane-backends-1.0.19-r2.ebuild:
-  Fix TeX dependencies, bug #216820.
-
-  12 Aug 2008; Patrick Kursawe <phosphan@gentoo.org>
-  +files/parallel-install-1.0.19.patch, sane-backends-1.0.19-r2.ebuild:
-  Fix for parallel install jobs, see bug #228937
-
-  06 Aug 2008; Markus Meier <maekke@gentoo.org>
-  sane-backends-1.0.19-r1.ebuild:
-  amd64 stable, bug #224973
-
-  01 Aug 2008; nixnut <nixnut@gentoo.org> sane-backends-1.0.19-r1.ebuild:
-  Stable on ppc wrt bug 224973
-
-*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:
-  Stable for HPPA (bug #224973).
-
-  11 Jun 2008; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.17.ebuild, sane-backends-1.0.18-r6.ebuild,
-  sane-backends-1.0.19-r1.ebuild:
-  Drop ia64 keyword, no hardware to test
-
-  07 Jun 2008; Friedrich Oslage <bluebird@gentoo.org>
-  sane-backends-1.0.19-r1.ebuild:
-  stable on sparc, bug #224973
-
-  06 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
-  sane-backends-1.0.19-r1.ebuild:
-  stable x86, bug 224973
-
-  05 Jun 2008; Tobias Klausmann <klausman@gentoo.org>
-  sane-backends-1.0.19-r1.ebuild:
-  Stable on alpha, bug #224973
-
-  05 Jun 2008; Markus Rothe <corsair@gentoo.org>
-  sane-backends-1.0.19-r1.ebuild:
-  Stable on ppc64; bug #224973
-
-  13 May 2008; Patrick Kursawe <phosphan@gentoo.org>
-  -files/udev-rule-2.patch, -files/udev-rule-3.patch,
-  -files/udev-rule.patch, sane-backends-1.0.17.ebuild,
-  -sane-backends-1.0.18-r2.ebuild, -sane-backends-1.0.18-r3.ebuild,
-  -sane-backends-1.0.18-r4.ebuild, -sane-backends-1.0.18-r5.ebuild,
-  sane-backends-1.0.18-r6.ebuild, -sane-backends-1.0.19.ebuild,
-  sane-backends-1.0.19-r1.ebuild:
-  Removing obsolete versions + cleaner solution for TeX-font-problems.
-
-  14 Apr 2008; Jeroen Roovers <jer@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild:
-  Stable for HPPA (bug #215861).
-
-  11 Apr 2008; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild:
-  ia64/sparc stable wrt #215861
-
-  08 Apr 2008; Patrick Kursawe <phosphan@gentoo.org>
-  +files/fujitsu_DBG_LEVEL.patch, sane-backends-1.0.19.ebuild,
-  sane-backends-1.0.19-r1.ebuild:
-  Fixing compilation error when -DNDEBUG is in CFLAGS, bug #216608.
-
-  07 Apr 2008; Tobias Klausmann <klausman@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild:
-  Stable on alpha, bug #215861
-
-  06 Apr 2008; Markus Meier <maekke@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild:
-  amd64/x86 stable, bug #215861
-
-*sane-backends-1.0.19-r1 (04 Apr 2008)
-
-  04 Apr 2008; Denis Dupeyron <calchan@gentoo.org>
-  +sane-backends-1.0.19-r1.ebuild:
-  Fixed dll.conf for hplip.
-
-  04 Apr 2008; Brent Baude <ranger@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild:
-  stable ppc64, bug 215861
-
-  03 Apr 2008; Brent Baude <ranger@gentoo.org>
-  sane-backends-1.0.18-r6.ebuild:
-  stable ppc, bug 215861
-
-*sane-backends-1.0.19 (07 Feb 2008)
-
-  07 Feb 2008; Patrick Kursawe <phosphan@gentoo.org>
-  +files/udev-rule-5.patch, sane-backends-1.0.17.ebuild,
-  sane-backends-1.0.18-r2.ebuild, sane-backends-1.0.18-r3.ebuild,
-  sane-backends-1.0.18-r4.ebuild, sane-backends-1.0.18-r5.ebuild,
-  +sane-backends-1.0.19.ebuild:
-  New version making the coolscan patch obsolete, corrected minor syntax
-  problems for older versions.
-
-*sane-backends-1.0.18-r6 (18 Jan 2008)
-
-  18 Jan 2008; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.18-r6.ebuild:
-  Fixing LaTeX related dependencies, see bug #199303
-
-  09 Oct 2007; Markus Rothe <corsair@gentoo.org>
-  sane-backends-1.0.18-r4.ebuild:
-  Stable on ppc64; bug #188573
-
-*sane-backends-1.0.18-r5 (05 Oct 2007)
-
-  05 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
-  +files/udev-rule-4.patch, +sane-backends-1.0.18-r5.ebuild:
-  Fixed file mode for libusb device nodes (664 as default rules do). Let the
-  udev rules ignore printer devices, Bug #193266. Renamed rules file to
-  70-libsane.rules.
-
-  05 Sep 2007; Raúl Porcel <armin76@gentoo.org>
-  sane-backends-1.0.18-r4.ebuild:
-  alpha/ia64/x86 stable wrt #188573
-
-  04 Sep 2007; Christoph Mende <angelos@gentoo.org>
-  sane-backends-1.0.18-r4.ebuild:
-  Stable on amd64 wrt bug #188573
-
-  24 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  sane-backends-1.0.18-r4.ebuild:
-  ppc stable, bug #188573
-
-  23 Aug 2007; Jeroen Roovers <jer@gentoo.org>
-  sane-backends-1.0.18-r4.ebuild:
-  Stable for HPPA (bug #188573).
-
-  22 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  sane-backends-1.0.18-r4.ebuild:
-  Stable on sparc wrt #188573
-
-*sane-backends-1.0.18-r4 (22 Aug 2007)
-
-  22 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
-  +files/udev-rule-3.patch, +sane-backends-1.0.18-r4.ebuild:
-  Sadly the udev-rules did break for older kernels. Using ATTRS instead of
-  ATTR makes them finally work for old AND new kernels, Bug 188573.
-
-  21 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  sane-backends-1.0.18-r3.ebuild:
-  Stable on sparc wrt #188573
-
-  21 Aug 2007; Jeroen Roovers <jer@gentoo.org>
-  sane-backends-1.0.18-r3.ebuild:
-  Stable for HPPA (bug #188573).
-
-*sane-backends-1.0.18-r3 (18 Aug 2007)
-
-  18 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
-  +files/udev-rule-2.patch, +sane-backends-1.0.18-r3.ebuild:
-  Updated udev rules, to work with newer kernels, Bug #188573. This requires
-  new udev-syntax, so block versions before udev-114.
-
-  30 Apr 2007; Marius Mauch <genone@gentoo.org> sane-backends-1.0.17.ebuild,
-  sane-backends-1.0.18-r2.ebuild:
-  Replacing einfo with elog
-
-  10 Apr 2007; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  Using doenvd instead of insinto /etc/env.d, bug #173884
-
-  09 Mar 2007; Patrick Kursawe <phosphan@gentoo.org>
-  -files/canoscan-focus.patch, -files/libusbscanner-device.patch,
-  -files/libusbscanner-device-r1.patch, -files/linux_sg3_err.h,
-  -files/sane-backend-1.0.15-gt68xx-update67.patch,
-  -sane-backends-1.0.15.ebuild, -sane-backends-1.0.15-r3.ebuild,
-  -sane-backends-1.0.18.ebuild:
-  Cleaning up old versions, leaving 1.0.17 because of bug #165315
-
-  26 Feb 2007; Patrick Kursawe <phosphan@gentoo.org>
-  +files/broken_coolscan.patch, sane-backends-1.0.18-r2.ebuild:
-  Added a little patch for a single broken driver, see bug #168220
-
-  20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
-  sane-backends-1.0.18-r2.ebuild:
-  Stable on Alpha.
-
-  14 Oct 2006; Tim Yamin <plasmaroo@gentoo.org>
-  sane-backends-1.0.18-r2.ebuild:
-  Stable on IA64; bug #148608.
-
-  02 Oct 2006; Daniel Gryniewicz <dang@gentoo.org>
-  sane-backends-1.0.18-r2.ebuild:
-  Marked stable on amd64 For bug #148608
-
-  01 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  sane-backends-1.0.18-r2.ebuild:
-  hppa stable, bug #148608
-
-  30 Sep 2006; <nixnut@gentoo.org> sane-backends-1.0.18-r2.ebuild:
-  Stable on ppc wrt bug 148608
-
-  29 Sep 2006; <ticho@gentoo.org> sane-backends-1.0.18-r2.ebuild:
-  Stable on x86, bug #148608.
-
-  25 Sep 2006; Jason Wever <weeve@gentoo.org>
-  sane-backends-1.0.18-r2.ebuild:
-  Stable on SPARC wrt bug #148608.
-
-  22 Sep 2006; Markus Rothe <corsair@gentoo.org>
-  sane-backends-1.0.18-r2.ebuild:
-  Stable on ppc64; bug #148608
-
-  29 Aug 2006; Marcus D. Hanwell <cryos@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  Marked stable on amd64, bug 141136.
-
-  11 Aug 2006; Markus Rothe <corsair@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  Stable on ppc64; bug #141136
-
-*sane-backends-1.0.18-r2 (31 Jul 2006)
-
-  31 Jul 2006; Patrick Kursawe <phosphan@gentoo.org>
-  -files/scsi-udev-rule.patch, +files/udev-rule.patch,
-  -sane-backends-1.0.18-r1.ebuild, +sane-backends-1.0.18-r2.ebuild:
-  Fix for overlong comments in the udev rules added, bug #142052
-
-*sane-backends-1.0.18-r1 (28 Jul 2006)
-
-  28 Jul 2006; Patrick Kursawe <phosphan@gentoo.org> -files/lide25-r1.patch,
-  -files/lide25.patch, -files/sm3600usb.patch,
-  -files/kernel2.6.13usb-problem.patch, -sane-backends-1.0.13-r3.ebuild,
-  -sane-backends-1.0.16-r4.ebuild, sane-backends-1.0.17.ebuild,
-  sane-backends-1.0.18.ebuild, +sane-backends-1.0.18-r1.ebuild,
-  files/scsi-udev-rule.patch:
-  Cleaning up quite a bit.
-  1.0.18-r1 adds udev rules for usb and scsi scanners, see bug #125784.
-  1.0.17 and newer fix some ancient "dodoc"s, bug #141924.
-
-  27 Jul 2006; Joshua Jackson <tsunam@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  Stable x86; bug #141136
-
-  26 Jul 2006; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.18.ebuild:
-  Fixing sandbox violation for bug #141769
-
-  22 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  ppc stable, bug #141136
-
-*sane-backends-1.0.18 (20 Jul 2006)
-
-  20 Jul 2006; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.18.ebuild:
-  Version bump. Can remove some sed magic because upstream fixed it.
-  Brother patch had to be updated. http download added because I could not
-  get it by FTP.
-
-  19 May 2006; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  Tetex wasn't necessary after all, see bug #133728
-
-  18 May 2006; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  Adding tetex to dependencies because of bug #123005
-
-  20 Feb 2006; Markus Rothe <corsair@gentoo.org>
-  sane-backends-1.0.15-r3.ebuild:
-  Stable on ppc64
-
-  18 Jan 2006; Jeroen Roovers <jer@gentoo.org> sane-backends-1.0.17.ebuild:
-  Marked for testing on hppa.
-
-  18 Jan 2006; Jeroen Roovers <jer@gentoo.org> sane-backends-1.0.15.ebuild:
-  Stable on hppa.
-
-  20 Dec 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.17.ebuild:
-  Correcting dependency: libusb 0.1.8
-
-  19 Dec 2005; Patrick Kursawe <phosphan@gentoo.org>
-  -sane-backends-1.0.15-r1.ebuild, -sane-backends-1.0.15-r2.ebuild,
-  -sane-backends-1.0.16-r1.ebuild, -sane-backends-1.0.16-r2.ebuild,
-  -sane-backends-1.0.16-r3.ebuild:
-  Removing old versions
-
-*sane-backends-1.0.17 (19 Dec 2005)
-
-  19 Dec 2005; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.17.ebuild:
-  Version bump. Dropped most patches (if included upstream).
-
-  29 Nov 2005; Jeroen Roovers <jer@gentoo.org> sane-backends-1.0.15.ebuild:
-  Marked ~hppa wrt bug 109180.
-
-  08 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> files/sm3600usb.patch:
-  Will I ever get sm3600 right? Links with sanei now.
-
-  07 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> +files/sm3600usb.patch:
-  Re-adding patch with substitution turned off
-
-  07 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> -files/sm3600usb.patch:
-  sm3600usb.patch was broken by keyword subsitution
-
-  04 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> files/sm3600usb.patch:
-  Yesterday's patch was broken
-
-  03 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> +files/sm3600usb.patch,
-  sane-backends-1.0.16-r4.ebuild:
-  Additional fix for sm3600 USB from sane-CVS
-
-*sane-backends-1.0.16-r4 (02 Nov 2005)
-
-  02 Nov 2005; Patrick Kursawe <phosphan@gentoo.org>
-  +files/kernel2.6.13usb-problem.patch, +sane-backends-1.0.16-r4.ebuild:
-  Fix for bug #109355 from sane-CVS
-
-*sane-backends-1.0.16-r3 (31 Oct 2005)
-
-  31 Oct 2005; Patrick Kursawe <phosphan@gentoo.org> +files/lide25-r1.patch,
-  +sane-backends-1.0.16-r3.ebuild:
-  Updated lide25 patch (bug #104026)
-
-  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
-  sane-backends-1.0.15-r3.ebuild:
-  Mark 1.0.15-r3 stable on alpha
-
-  19 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.16-r2.ebuild:
-  Getting to the root of the problem for -ffast-math (bug #103118)
-
-  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ChangeLog:
-  Mark 1.0.15-r3 stable on ia64
-
-  12 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.16-r2.ebuild:
-  Creating lock directory in a different way (see bug #105429)
-
-  05 Sep 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.16-r2.ebuild:
-  Filtering -fstack-protector for amd64 (see bug #104303)
-
-*sane-backends-1.0.16-r2 (30 Aug 2005)
-
-  30 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> +files/lide25.patch,
-  +sane-backends-1.0.16-r2.ebuild, -sane-backends-1.0.16.ebuild:
-  Adding lock directory (used by some backends, bug #104025) and support for
-  LiDE25 scanners (bug #104026)
-
-  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.16-r1.ebuild:
-  Filtering -ffast-math (bug #103118)
-
-*sane-backends-1.0.16-r1 (22 Aug 2005)
-
-  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.16-r1.ebuild:
-  Adding again the BrotherMFC-Patch from sourceforge, adapted for .16 by Joachim
-  Feise.
-
-  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.16.ebuild:
-  Tried to unpack a patch that wasn't downloaded (see bug #103152)
-
-*sane-backends-1.0.16 (19 Aug 2005)
-
-  19 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.16.ebuild:
-  Version bump. Most old patches should not be necessary any more. Attention
-  BrotherMFC-users: I didn't yet find the time to port this patch to .16, so it
-  is currently disabled.
-  If you have problems that your scanner isn't found when you use
-  $SANE_BACKENDS, please comment on bug #90598. I haven't been able to
-  reproduce this problem so far.
-
-*sane-backends-1.0.15-r3 (04 Aug 2005)
-
-  04 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.15-r3.ebuild:
-  Getting gt68xx-Version from SANE CVS because of bug #101248
-
-  30 May 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.15-r1.ebuild, sane-backends-1.0.15-r2.ebuild,
-  sane-backends-1.0.15.ebuild:
-  Fixing gphoto dependency
-
-  10 May 2005; Aron Griffis <agriffis@gentoo.org>
-  sane-backends-1.0.15-r1.ebuild, sane-backends-1.0.15-r2.ebuild:
-  add ~ia64 #91975
-
-*sane-backends-1.0.15-r2 (09 May 2005)
-
-  09 May 2005; Patrick Kursawe <phosphan@gentoo.org>
-  -sane-backends-1.0.14-r3.ebuild, -sane-backends-1.0.14-r6.ebuild,
-  +sane-backends-1.0.15-r2.ebuild:
-  Compiling (almost) only selected backends using $SANE_BACKENDS now.
-  See bug #90598.
-  The patch by Diego (flameeyes@gentoo.org) also does some cleanups and adds
-  parallel port support for amd64.
-  Cleaning up unused versions.
-
-*sane-backends-1.0.15-r1 (27 Apr 2005)
-
-  27 Apr 2005; Patrick Kursawe <phosphan@gentoo.org>
-  +files/sane-backend-1.0.15-gt68xx-update67.patch,
-  +sane-backends-1.0.15-r1.ebuild:
-  Fixes for gt68xx-based scanners (bug #90442)
-
-  08 Apr 2005; Markus Rothe <corsair@gentoo.org>
-  sane-backends-1.0.15.ebuild:
-  Stable on ppc64
-
-  01 Apr 2005; Lars Weiler <pylon@gentoo.org> sane-backends-1.0.15.ebuild:
-  Stable on ppc.
-
-  24 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
-  sane-backends-1.0.15.ebuild:
-  Fixed stupid typo in previous fix. Thanks to greg_g for his eagle eyes :-).
-
-  23 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
-  sane-backends-1.0.15.ebuild:
-  Fixed BUG #86354 (multilib-strict). Marked stable on amd64.
-
-  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
-  sane-backends-1.0.15.ebuild:
-  Stable on alpha.
-
-  10 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  sane-backends-1.0.15.ebuild:
-  Stable on sparc
-
-  10 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.15.ebuild:
-  Stable for x86
-
-  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
-  sane-backends-1.0.14-r6.ebuild:
-  Stable on amd64.
-
-  24 Nov 2004; Dominik Stadler <centic@gentoo.org>
-  sane-backends-1.0.13-r3.ebuild, sane-backends-1.0.14-r3.ebuild,
-  sane-backends-1.0.14-r6.ebuild, sane-backends-1.0.15.ebuild:
-  Update homepage to http://www.sane-project.org/
-
-  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
-  sane-backends-1.0.15.ebuild:
-  ~alpha keyword.
-
-*sane-backends-1.0.15 (16 Nov 2004)
-
-  16 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.15.ebuild:
-  Version bump.
-  Niash support has been added upstream, removing the patch.
-  Brothermfc-Patch needed slight changes.
-
-  02 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  sane-backends-1.0.14-r6.ebuild:
-  Stable on sparc
-
-  02 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
-  -sane-backends-1.0.14-r2.ebuild, -sane-backends-1.0.14-r4.ebuild,
-  -sane-backends-1.0.14-r5.ebuild, sane-backends-1.0.14-r6.ebuild:
-  Cleanup; -r6 stable for x86.
-
-  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
-  sane-backends-1.0.14-r2.ebuild, sane-backends-1.0.14-r3.ebuild:
-  Stable on amd64.
-
-  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
-  sane-backends-1.0.14-r6.ebuild:
-  KEYWORDS ~amd64.
-
-*sane-backends-1.0.14-r6 (22 Sep 2004)
-
-  22 Sep 2004; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.14-r6.ebuild:
-  Using ipv6 USE flag now, see bug #64376.
-
-*sane-backends-1.0.14-r5 (30 Aug 2004)
-
-  30 Aug 2004; Patrick Kursawe <phosphan@gentoo.org>
-  +sane-backends-1.0.14-r5.ebuild:
-  Bug #29506 revisited. Canon 2700F focus problems.
-
-  26 Aug 2004; Jason Wever <weeve@gentoo.org> sane-backends-1.0.14-r3.ebuild:
-  Stable on sparc.
-
-  25 Aug 2004; Jason Wever <weeve@gentoo.org> :
-  Stable on sparc.
-
-*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
-
-  27 Jul 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.14-r2.ebuild, sane-backends-1.0.14-r3.ebuild:
-  Moving enewgroup where it belongs (bug #58526)
-
-  30 Jun 2004; Lars Weiler <pylon@gentoo.org> sane-backends-1.0.14-r3.ebuild:
-  Stable on ppc.  1.0.13-r3 does not compile any more.
-
-  19 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
-  sane-backends-1.0.14-r2.ebuild:
-  Marked ~amd64.
-
-  18 Jun 2004; Jason Wever <weeve@gentoo.org> sane-backends-1.0.14-r3.ebuild:
-  Added ~sparc keyword (not sure where it went).
-
-*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,
-  sane-backends-1.0.13-r2.ebuild, sane-backends-1.0.13.ebuild,
-  sane-backends-1.0.14-r1.ebuild, sane-backends-1.0.14-r2.ebuild,
-  sane-backends-1.0.14-r3.ebuild, sane-backends-1.0.14.ebuild:
-  Big cleanup. 1.0.14-r2 stable for x86.
-
-*sane-backends-1.0.14-r3 (11 May 2004)
-
-  11 May 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.14-r3.ebuild:
-  Adding parport direct io support
-
-*sane-backends-1.0.14-r2 (10 May 2004)
-
-  10 May 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.14-r2.ebuild, files/libusbscanner-device.patch:
-  Some little fixes for bug #49815 (added scanner group, made script executable,
-  added device variable workaround)
-
-*sane-backends-1.0.14-r1 (06 May 2004)
-
-  06 May 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.14-r1.ebuild:
-  Now also installing hotplug related files, see bug #49815
-
-*sane-backends-1.0.14 (05 May 2004)
-
-  05 May 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.14.ebuild:
-  Version bump - added gphoto2 USE support, thanks to bug #48992
-
-  03 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13-r3.ebuild:
-  Now really moving to stable.
-
-  28 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13-r3.ebuild:
-  Increased revision number of patch
-
-*sane-backends-1.0.13-r3 (27 Feb 2004)
-
-  27 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13-r3.ebuild:
-  Time to go stable. The -r2 -r3 update can't cause any harm.
-
-*sane-backends-1.0.13-r3 (27 Feb 2004)
-
-  27 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13-r3.ebuild:
-  Patch for brother usb scanner was changed because of bug #43028, increased
-  revision number to force update.
-
-  28 Jan 2004; Aron Griffis <agriffis@gentoo.org>
-  sane-backends-1.0.12-r2.ebuild, sane-backends-1.0.13-r1.ebuild,
-  sane-backends-1.0.13-r2.ebuild, sane-backends-1.0.13.ebuild:
-  ia64 keywords changes
-
-*sane-backends-1.0.13-r2 (11 Dec 2003)
-
-  11 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13-r2.ebuild:
-  Added support for Brother MFC 4600 via USB if "usb" is in USE. The patch
-  originates from http://sourceforge.net/projects/brother-mfc/ but had to be
-  modified for 1.0.13.
-
-  10 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.11.ebuild, sane-backends-1.0.12-r1.ebuild,
-  sane-backends-1.0.12-r2.ebuild, sane-backends-1.0.13_pre2.ebuild,
-  sane-backends-1.0.8-r2.ebuild:
-  Cleanup.
-
-*sane-backends-1.0.13-r1 (10 Dec 2003)
-
-  10 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13-r1.ebuild:
-  Now bings in libusb for sm3600 support if "usb" is in USE.
-
-*sane-backends-1.0.13 (24 Nov 2003)
-
-  24 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13.ebuild:
-  Version bump
-
-  29 Nov 2003; Brad House <brad_mssw@gentoo.org>
-  sane-backends-1.0.12-r2.ebuild:
-  mark stable on amd64
-
-*sane-backends-1.0.13_pre2 (11 Nov 2003)
-
-  11 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.13_pre2.ebuild:
-  Version bump, removed patches for new release.
-
-  26 Oct 2003; Brad House <brad_mssw@gentoo.org>
-  sane-backends-1.0.12-r2.ebuild:
-  add ~amd64 flag
-
-*sane-backends-1.0.12-r2 (08 Oct 2003)
-
-  08 Oct 2003; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
-  sane-backends-1.0.12-r2.ebuild, files/canoscan-focus.patch:
-  Added workaround patch for canoscan 2700F focus problems, switches
-  off focusing.
-
-  10 Sep 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.12-r1.ebuild:
-  Fixed access violation when generating sane.ps (bug #28303).
-  Now bug 23974 should really be dead.
-
-*sane-backends-1.0.12-r1 (25 Aug 2003)
-
-  25 Aug 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.12-r1.ebuild:
-  Added updated plustek driver (bug 27280) and fixed bug 23974.
-
-  11 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
-  sane-backends-1.0.11.ebuild, sane-backends-1.0.12.ebuild,
-  sane-backends-1.0.9.ebuild:
-  Updated download URIs
-
-  20 Jun 2003; mkeadle <mkeadle@gentoo.org> sane-backends-1.0.11.ebuild:
-  moving from ~x86 to stable. stable, and closes bug #23163.
-
-*sane-backends-1.0.12 (19 Jun 2003)
-
-  19 Jun 2003; mkeadle <mkeadle@gentoo.org> sane-backends-1.0.12.ebuild:
-  bump to latest upstream stable
-
-*sane-backends-1.0.11 (09 Mar 2003)
-
-  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*sane-backends-1.0.9 (01 Dec 2002)
-
-  06 Jan 2002; Matt Keadle <mkeadle@gentoo.org> sane-backends-1.0.9.ebuild
-
-  Unmasking for x86 and moving to stable.
-
-  01 Dec 2002; Matt Keadle <mkeadle@gentoo.org> sane-backends-1.0.9.ebuild
-  files/digest-sane-backends-1.0.9
-
-  Version bump to latest release.
-
-*sane-backends-1.0.8-r2 (03 Jul 2002)
-
-  15 Sep 2002; Maarten Thibaut <murphy@gentoo.org> sane-backends-1.0.8-r2.ebuild :
-  Added keywords for sparc and sparc64.
-
-  11 Aug 2002; Mark Guertin <gerk@gentoo.org> sane-backends-1.0.8-r2.ebuild :
-  Adjusted for new arch checks in DEPEND
-
-  03 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
-  sane-backends-1.0.8-r2.ebuild files/digest-sane-backends-1.0.8-r2 :
-
-  Added libieee1284 to DEPEND so that the canon drivers get built as well
-  now.  Thanks to troy@tkdack.com (Troy Dack) in bug #4207
-
-*sane-backends-1.0.8-r1 (24 Jun 2002)
-
-  24 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
-  sane-backends-1.0.8-r1.ebuild files/digest-sane-backends-1.0.8-r1 :
-
-  Made src_install() install the /etc/env.d file instead of pkg_postinst()
-  so that unmerge will remove it as well. Fix suggested by arcady@gentoo.org
-
-*sane-backends-1.0.8 (22 Jun 2002)
-
-  22 Jun 2002; Ryan Phillips <rphillips@gentoo.org> sane-backends-1.0.8.ebuild
-  files/digest-sane-backends-1.0.8
-
-  New version
-
-*sane-backends-1.0.7-r1 (13 Apr 2002)
-
-  13 Apr 2002; Seemant Kulleen <seemant@gentoo.org>
-  sane-backends-1.0.7-r1.ebuild files/digest-sane-backends-1.0.7-r1 :
-
-  Added a pkg_postinst() function to add the SANE_CONFIG_DIR environment
-  variable.  This solution was found by the bug reporter of bug #1595,
-  MvOstheim@web.de (Michael v.Ostheim)
-
-*sane-backends-1.0.7 (2 Mar 2002)
-
-  2 Mar 2002; Chris Houser <chouser@gentoo.org>
-	files/digest-sane-backends-1.0.7 ChangeLog sane-backends-1.0.7.ebuild :
-
-  Upgraded package -- no ebuild changes were needed.
-
-*sane-backends-1.0.5-r1 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 2c4edc0ec216..761631f1dcdb 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -7,6 +7,7 @@ AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e
 AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
 AUX genesys_io.patch 918 RMD160 fe105f644eec67a8626db78820a79f51c55ff2ca SHA1 6b75065e2db52ebc7ea58c89e4b4738a016c5b28 SHA256 c45f86420009e1c12c5cde449509bd7c14e94663b36969ff8f60732cb784eff7
 AUX parallel-install-1.0.19.patch 1117 RMD160 c6bc5abc5275dea4418f61cdd4dc007a45e12454 SHA1 5b5e9082f39d34d68fdefd5531e257fb7f7bdbda SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f
+AUX sane-backends-1.0.22-libv4l-0.8.3.patch 999 RMD160 8b0a462c87e577cd4e1ae9cadb60c9b8fa340970 SHA1 7550b1a85bd127fa47218c002347b91680b7f1fc SHA256 bbfeaead9ed58110974c01d79b0b723e7fb34b9c4c73b1a78672b56376ca82bd
 AUX sane-backends-1.0.22-xerox_mfp-usb.patch 2308 RMD160 8b5547706e391226c33f8fcaa451c384844afba8 SHA1 1e10c4057d839e7a6263d5721b4b47984d7cbb88 SHA256 d3d9a03cb082fb1b735debbfe8a948cb4cee14b13c53a4cc9cd49f23174972c0
 AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
 AUX udev-rule-5.patch 1462 RMD160 116e50bff2d00238946595136de535bdd0a747ff SHA1 cdbb5db3fe6c8e5660d86be7391e345ea242ba43 SHA256 edcf1275743ea4e418ec1468f990ad005f55f22bdf8ef143beda04fbbe070b6d
@@ -25,17 +26,15 @@ DIST sane-backends-1.0.22.tar.gz 5150661 RMD160 524713474a819331d0179fa642fef710
 EBUILD sane-backends-1.0.17.ebuild 3761 RMD160 f07ceda376d30bb977b5cbe120a4acd7243dcb88 SHA1 002313d0e4cd5369caf7ae21c2587d93ace69572 SHA256 523b0a02b2720cb548b7946e2e4b41ce7a6b4326414b96dfe29ad9b87b3cb4fe
 EBUILD sane-backends-1.0.18-r6.ebuild 4299 RMD160 d80870a16bbc025f7f5bf63ec792f5a8809569cd SHA1 b929cfa79c3fdc54c047019e51015427506a0761 SHA256 7d76e2047c01c7921d7a525779111624a80f58c9226990376e33700c92a061b5
 EBUILD sane-backends-1.0.19-r2.ebuild 4503 RMD160 f9339b89a1aa6530684e4cd7c721ff732e1e3381 SHA1 511ca15219f5519f2b415fedbcaec02f29058cfa SHA256 78a92bde5174dfac63977a6fd55c47aa2ddb4abf2238c475e11802675c39471e
-EBUILD sane-backends-1.0.20-r3.ebuild 4450 RMD160 aa8b68ee5de73e1a07604d5128d4602b99a7c18a SHA1 edf22132f28bb59e19be12d3a35a838b0cbbeaa8 SHA256 b516938dcf9b5c5f4d60cb11f08da29465cfb9eccd0334602c3fcac45aa369fd
-EBUILD sane-backends-1.0.21-r1.ebuild 4594 RMD160 de32cd6548de20b9e2888f4fbedce03b137c1b22 SHA1 77e3cee23e93d4674cabddbc6fd2c26c21e828a1 SHA256 bb5d47586cf04126867146144734b8d1d9fb9d1e896c127d7ad68451d786674c
-EBUILD sane-backends-1.0.21.ebuild 4601 RMD160 e34da90534768f9b9aef1cb81459db3f98e2765e SHA1 00e4b4ea2f184f67274959cbb295cf73f94641ae SHA256 7faea4a57ba759eebd38edd495d5d1dc4a0c10aefce5d2c74fb141a0ee00f1a7
-EBUILD sane-backends-1.0.22-r1.ebuild 4571 RMD160 6439c3240cde4269f0d2323f8ef995b1cd27b46e SHA1 19731e8c36b738484ce43e755e301aa8ecd8e6df SHA256 31e2a590a6419ab531bf5e0310364154c3f7ab743be5169cd988c835239bdb25
-EBUILD sane-backends-1.0.22.ebuild 4530 RMD160 c5ff2b6d21a0923921addd8c26180e206800dca3 SHA1 77e26d387fea0e341b0690751bfb5a2e98669457 SHA256 12f9c785ccf631b0e34e1b899e95e15f165e4b10e63e1015eb07e073ec34d549
-MISC ChangeLog 31547 RMD160 ab85d1841334582161a540c29b95a12dc268257b SHA1 e18160554da26f9db9dfaead9767234dd2bb6f36 SHA256 179731e86d1fcf7878fc8163943b3b2ec9a9144bdbfb1df1ef8fe87eabd452c3
+EBUILD sane-backends-1.0.20-r3.ebuild 4435 RMD160 69a8bc3d72eba14f5e13b1a8dac15953389fc388 SHA1 bea002c8b8e8929bceadde859593c610e1688dcb SHA256 a1da2dea06dcb2f26593d9b1e0cba11c0fef010cded6df8c76de1b4eb8812fa7
+EBUILD sane-backends-1.0.21-r1.ebuild 4661 RMD160 5e9b3c544fe3e3cd79698343748f73674f91d54f SHA1 2917d9bddcb98c42c17f8e33e720eea6e9a794bd SHA256 ab13855ecdac72734defe8e717206b64b1a81c223895948b11f5ff4f3279319b
+EBUILD sane-backends-1.0.22-r1.ebuild 4632 RMD160 14a31e406450c66d0a5b7c30e6d46e29dbe91d47 SHA1 683d92dd509226b2f71c9e759c30875d38bf18be SHA256 cef0b778cf6359b5ee783e30f07c526db8eccdfb05d952049a49bff7409c9fe6
+MISC ChangeLog 641 RMD160 0cf27473e8cb8848c215c355df60de604c765925 SHA1 cbf9306cd10920ceb25c605eeada8ff853c794e4 SHA256 cafc57354b660b2a120bb88fe9a50d5a17a72010929cc7bec4d70da98d5a7ad9
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3Vn4kACgkQFYEBGcdFJfLe1QD/TT8KSbpj7YOxA1KlBqxUVc5O
-mKytTulnr1qK5ICdxsIA/2Z+Hg8uVpi3cxYrwkzPfbGq2Tdo20o9fHLG5e8mjUiM
-=pAK8
+iF4EAREIAAYFAk47uH8ACgkQFYEBGcdFJfIaEAEAhk787VyNRXSxc/JY8jcWz2q7
+ChvRm7S6M7clg5CBu6QA/2pdq2L9/U0Nkjq0rheC9qPn5nWLSqM5ZH6lUKvj7jPv
+=rfjG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.22-libv4l-0.8.3.patch b/media-gfx/sane-backends/files/sane-backends-1.0.22-libv4l-0.8.3.patch
new file mode 100644
index 000000000000..91781d7721ab
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.22-libv4l-0.8.3.patch
@@ -0,0 +1,45 @@
+From c5ca46c2d1be78c651afb843cc834cf2b5b24953 Mon Sep 17 00:00:00 2001
+From: Julien BLACHE <jb@jblache.org>
+Date: Wed, 16 Feb 2011 19:37:43 +0100
+Subject: [PATCH] Fix v4l build with libv4l 0.8.3+
+
+---
+diff --git a/backend/v4l.c b/backend/v4l.c
+index 6510ef0..38595ed 100644
+--- a/backend/v4l.c
++++ b/backend/v4l.c
+@@ -84,9 +84,8 @@
+ #include "../include/sane/sanei_config.h"
+ #define V4L_CONFIG_FILE "v4l.conf"
+ 
+-#include "v4l.h"
+-
+ #include <libv4l1.h>
++#include "v4l.h"
+ 
+ static const SANE_Device **devlist = NULL;
+ static int num_devices;
+diff --git a/backend/v4l.h b/backend/v4l.h
+index 588b96e..6aee586 100644
+--- a/backend/v4l.h
++++ b/backend/v4l.h
+@@ -29,6 +29,7 @@
+ #ifndef v4l_h
+ #define v4l_h
+ 
++#ifndef __LINUX_VIDEODEV_H
+ /* Kernel interface */
+ /* Only the stuff we need. For more features, more defines are needed */
+ 
+@@ -165,7 +166,7 @@ struct video_channel
+ 
+ 
+ /* end of kernel interface */
+-
++#endif /* !__LINUX_VIDEODEV_H */
+ 
+ #include <../include/sane/sane.h>
+ 
+-- 
+1.7.2.5
+
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
index 38e45b7b3e73..316077dc72f7 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r3.ebuild,v 1.6 2011/01/21 20:52:27 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20-r3.ebuild,v 1.7 2011/08/05 09:31:25 voyageur Exp $
 
 EAPI="1"
 
@@ -114,7 +114,7 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 	doc? (
 		virtual/latex-base
-		|| ( dev-texlive/texlive-latexextra app-text/tetex app-text/ptex )
+		|| ( dev-texlive/texlive-latexextra app-text/ptex )
 	)
 	>=sys-apps/sed-4"
 
diff --git a/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
index 68030ec495e9..7162cb0c24cb 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.21-r1.ebuild,v 1.10 2011/02/25 08:52:40 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild,v 1.11 2011/08/05 09:31:25 voyageur Exp $
 
 EAPI="1"
 
@@ -161,6 +161,8 @@ src_unpack() {
 	EOF
 	epatch "${DISTDIR}/${P}-i18n.patch"
 	epatch "${FILESDIR}/xerox-grey.patch"
+	# Bug #356919
+	epatch "${FILESDIR}"/${PN}-1.0.22-libv4l-0.8.3.patch
 }
 
 src_compile() {
diff --git a/media-gfx/sane-backends/sane-backends-1.0.21.ebuild b/media-gfx/sane-backends/sane-backends-1.0.21.ebuild
deleted file mode 100644
index 019f7b0be172..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.21.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2011 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.21.ebuild,v 1.4 2011/01/21 20:52:27 phosphan Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic multilib
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-# The mustek_usb2 backend would force us to use --enable-pthreads which is off
-# by default for linux. Let's keep this one out until we find a way how to
-# handle this cleanly.
-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
-	kodak
-	kvs1025
-	leo
-	lexmark
-	ma1509
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	nec
-	net
-	niash
-	p5
-	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? ( virtual/jpeg )
-	sane_backends_dc240? ( virtual/jpeg )
-	sane_backends_dell1600n_net? ( virtual/jpeg )
-	avahi? ( >=net-dns/avahi-0.6.24 )
-	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
-				virtual/jpeg
-			)
-	v4l? ( media-libs/libv4l )"
-
-DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
-	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/3258/${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
-	ftp://ftp.sane-project.org/pub/sane/${P}/${P}-i18n.patch"
-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
-}
-
-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 "${DISTDIR}/${P}-i18n.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
-	if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then
-		myconf="${myconf} sane_cv_use_libieee1284=no"
-	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 /$(get_libdir)/udev/rules.d
-	insinto /$(get_libdir)/udev/rules.d
-	newins libsane.rules 39-libsane.rules
-	cd ../..
-	dodoc NEWS AUTHORS ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
index 1ce4e15f9cd5..ed249c36d279 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.22-r1.ebuild,v 1.1 2011/05/19 22:53:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r1.ebuild,v 1.2 2011/08/05 09:31:25 voyageur Exp $
 
 EAPI="4"
 
@@ -150,6 +150,8 @@ src_prepare() {
 
 	# Bug #368083
 	epatch "${FILESDIR}"/${P}-xerox_mfp-usb.patch
+	# Bug #356919
+	epatch "${FILESDIR}"/${P}-libv4l-0.8.3.patch
 }
 
 src_configure() {
diff --git a/media-gfx/sane-backends/sane-backends-1.0.22.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22.ebuild
deleted file mode 100644
index 81a0f9a6be8c..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.22.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2011 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.22.ebuild,v 1.1 2011/05/08 19:35:19 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-# The mustek_usb2 backend would force us to use --enable-pthreads which is off
-# by default for linux. Let's keep this one out until we find a way how to
-# handle this cleanly.
-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
-	kodak
-	kvs1025
-	kvs20xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	nec
-	net
-	niash
-	p5
-	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? ( virtual/jpeg )
-	sane_backends_dc240? ( virtual/jpeg )
-	sane_backends_dell1600n_net? ( virtual/jpeg )
-	avahi? ( >=net-dns/avahi-0.6.24 )
-	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
-		virtual/jpeg
-	)
-	v4l? ( media-libs/libv4l )"
-
-DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
-	doc? (
-		virtual/latex-base
-		|| ( dev-texlive/texlive-latexextra app-text/ptex )
-	)
-	>=sys-apps/sed-4"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114"
-
-SRC_URI="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"
-
-pkg_setup() {
-	enewgroup scanner
-}
-
-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
-	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
-	epkowa
-	EOF
-	#epatch "${DISTDIR}/${P}-i18n.patch"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# the blank is intended - an empty string would result in building ALL backends.
-	local BACKENDS=" "
-
-	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
-
-	local 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
-	if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then
-		myconf="${myconf} sane_cv_use_libieee1284=no"
-	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}
-}
-
-src_compile() {
-	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 () {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF} || die
-	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
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins tools/hotplug/libsane.usermap
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README tools/hotplug/README.hotplug
-		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
-	fi
-	insinto /$(get_libdir)/udev/rules.d
-	newins tools/udev/libsane.rules 41-libsane.rules
-
-	dodoc NEWS AUTHORS ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
-}