--- /usr/portage/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild	2011-02-25 04:01:15.000000000 -0500
+++ /usr/portage/media-gfx/sane-backends/sane-backends-1.0.21-r1.ebuild	2011-05-07 21:25:30.000000000 -0400
@@ -91,7 +91,7 @@ 
 	umax1220u
 	xerox_mfp"
 
-IUSE="avahi usb gphoto2 ipv6 v4l doc"
+IUSE="avahi usb gphoto2 ipv6 v4l doc libusb_1"
 
 for backend in ${IUSE_SANE_BACKENDS}; do
 	IUSE="${IUSE} +sane_backends_${backend}"
@@ -108,12 +108,13 @@ 
 	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 )"
+	v4l? ( media-libs/libv4l )
+	libusb_1? ( virtual/libusb:1 )"
+	#usb? ( virtual/libusb:0 )
 
 DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
@@ -128,13 +129,11 @@ 
 	!<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"
+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"
+KEYWORDS="~amd64"
 
 # the blank is intended - an empty string would result in building ALL backends.
 BACKENDS=" "
@@ -159,8 +158,8 @@ 
 	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
 	hpaio
 	EOF
-	epatch "${DISTDIR}/${P}-i18n.patch"
-	epatch "${FILESDIR}/xerox-grey.patch"
+#	epatch "${DISTDIR}/${P}-i18n.patch"
+#	epatch "${FILESDIR}/xerox-grey.patch"
 }
 
 src_compile() {
@@ -170,6 +169,9 @@ 
 	if ! use doc; then
 		myconf="${myconf} --disable-latex"
 	fi
+	if use libusb_1; then
+		myconf="${myconf} --enable-libusb_1_0"
+	fi
 	if use sane_backends_mustek_pp; then
 		myconf="${myconf} --enable-parport-directio"
 	fi