Version bump + cleanups

(Portage version: 2.0.51.22-r3)

12 files changed, 53 insertions, 589 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index c7645ad7763e..36e8dd2ece0a 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.88 2005/11/29 03:45:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.89 2005/12/19 14:32:40 phosphan Exp $
+
+  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.
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 2e6070dc3d02..c4bb104c21a1 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,29 +1,21 @@
-MD5 75721c4a9c58b46496086e7794727e43 ChangeLog 15079
+MD5 c78b176b2771e35a75ce086baf096fa4 sane-backends-1.0.15.ebuild 2599
+MD5 8c23aab107d4c5424e32e24123d4811f sane-backends-1.0.16-r4.ebuild 4386
+MD5 c0ac90aeb135bcac64417e970bc7b345 sane-backends-1.0.17.ebuild 3874
+MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
+MD5 df5b820dd52a3e205341d9fe78f44c7e ChangeLog 15512
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 d04dce955a1bf3c5436bc517f2e2070c sane-backends-1.0.15-r3.ebuild 3973
+MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
+MD5 bd0e1ecf807f1e676c4466f12cac215a files/lide25-r1.patch 7949
+MD5 3c9eec3f3f2e73bd6228f946f41c08b8 files/kernel2.6.13usb-problem.patch 1125
+MD5 f49c8e2b591496e87e91ae243d9864d0 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
+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 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
-MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r1 157
-MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15-r2 157
 MD5 d16f7594dad0db0c268e143c3676041e files/digest-sane-backends-1.0.15-r3 220
-MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r1 151
-MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r2 151
-MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r3 151
 MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r4 151
-MD5 3c9eec3f3f2e73bd6228f946f41c08b8 files/kernel2.6.13usb-problem.patch 1125
-MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681
-MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
-MD5 bd0e1ecf807f1e676c4466f12cac215a files/lide25-r1.patch 7949
 MD5 0bc1f6b8682b5585c8e87a325f983ade files/lide25.patch 5565
-MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
-MD5 f49c8e2b591496e87e91ae243d9864d0 files/sane-backend-1.0.15-gt68xx-update67.patch 5682
+MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
+MD5 4ef63f9aac04a28e55b2c11333ec4df5 files/digest-sane-backends-1.0.17 151
 MD5 76ecccefb14f182ef419873f26693129 files/sm3600usb.patch 7815
-MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
-MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
-MD5 e73a3bf54c049342701898a62ea3b301 sane-backends-1.0.15-r1.ebuild 2674
-MD5 544c2bc7c5a23b2ae8280b879eac1fbb sane-backends-1.0.15-r2.ebuild 3912
-MD5 d04dce955a1bf3c5436bc517f2e2070c sane-backends-1.0.15-r3.ebuild 3973
-MD5 c78b176b2771e35a75ce086baf096fa4 sane-backends-1.0.15.ebuild 2599
-MD5 61d573be9593ba3be2da335586ac7eb2 sane-backends-1.0.16-r1.ebuild 3743
-MD5 a89929370bb0df2da7a794efc7811785 sane-backends-1.0.16-r2.ebuild 4297
-MD5 54cad14b24bc825f61130e50ea2238f8 sane-backends-1.0.16-r3.ebuild 4300
-MD5 8c23aab107d4c5424e32e24123d4811f sane-backends-1.0.16-r4.ebuild 4386
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r1 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r1
deleted file mode 100644
index 4ce538aa12b2..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3b804f35cdfbc5ad2d201ffe078bbac9 sane-backends-1.0.15.tar.gz 3231759
-MD5 f2d2c62caf1d4e12005fbb8ee62a5f39 sane-backends-1.0.15-brothermfc.patch.bz2 9753
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r2 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r2
deleted file mode 100644
index 4ce538aa12b2..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.15-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3b804f35cdfbc5ad2d201ffe078bbac9 sane-backends-1.0.15.tar.gz 3231759
-MD5 f2d2c62caf1d4e12005fbb8ee62a5f39 sane-backends-1.0.15-brothermfc.patch.bz2 9753
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r1 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r1
deleted file mode 100644
index c28bef8f1d50..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
-MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r2 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r2
deleted file mode 100644
index c28bef8f1d50..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
-MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.17
index c28bef8f1d50..3e123b7c0bc5 100644
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.16-r3
+++ b/media-gfx/sane-backends/files/digest-sane-backends-1.0.17
@@ -1,2 +1,2 @@
-MD5 bec9b9262246316b4ebfe2bc7451aa28 sane-backends-1.0.16.tar.gz 3409799
+MD5 b51c10da8a81a04e1bae88c9e6556df2 sane-backends-1.0.17.tar.gz 3588993
 MD5 321ec37f7229dda4dc86b06301cfad8e sane-1.0.16-brother-driver.diff.bz2 8224
diff --git a/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild
deleted file mode 100644
index 9af28c222804..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2005 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.15-r1.ebuild,v 1.3 2005/05/30 07:11:35 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2 ipv6"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( sys-libs/libieee1284 )
-	=sys-apps/sed-4*
-	usb? ( dev-libs/libusb )
-	gphoto2? ( media-libs/libgphoto2 )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.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://gentoo/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
-
-
-src_unpack() {
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	cd ${S}
-
-	epatch ${FILESDIR}/canoscan-focus.patch
-	epatch ${FILESDIR}/sane-backend-1.0.15-gt68xx-update67.patch
-
-	#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
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb) $(use_with gphoto2) $(use_enable ipv6)"
-	./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} \
-		libdir=${D}/usr/$(get_libdir) \
-		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
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild
deleted file mode 100644
index 16061074b36d..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.15-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2005 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.15-r2.ebuild,v 1.3 2005/05/30 07:11:35 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2 ipv6 v4l"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-DEPEND=">=media-libs/jpeg-6b
-	amd64? ( sys-libs/libieee1284 )
-	x86? ( sys-libs/libieee1284 )
-	usb? ( dev-libs/libusb )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.15-brothermfc.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://gentoo/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#   abaton agfafocus apple artec as6e avision bh canon canon630u coolscan
-#   coolscan2 dc25 dmc epson fujitsu gt68xx hp leo matsushita microtek
-#   microtek2 mustek mustek_usb nec pie plustek plustek_pp ricoh s9036
-#   sceptre sharp sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp
-#   umax1220u artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash dc210 dc240
-#   pint net
-#
-# Note that some backends has specific dependencies which make the compilation
-# fail because not supported on your current platform.
-pkg_setup() {
-	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
-
-	if [[ "${SANE_BACKENDS}" != "" ]]; then
-		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
-		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
-		use usb && SANE_BACKENDS="${SANE_BACKENDS} sm3600"
-	fi
-
-	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
-		einfo "You can use the variable SANE_BACKENDS to pick backends"
-		einfo "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	cd ${S}
-
-	epatch ${FILESDIR}/canoscan-focus.patch
-	epatch ${FILESDIR}/sane-backend-1.0.15-gt68xx-update67.patch
-
-	#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
-
-	if use usb; then
-		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-		epatch ${FILESDIR}/libusbscanner-device-r1.patch
-	fi
-}
-
-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 || die
-
-	if use usb; then
-		cd tools/hotplug
-		grep -v '^$' libsane.usermap > libsane.usermap.new
-		mv libsane.usermap.new libsane.usermap
-	fi
-}
-
-src_install () {
-	einstall docdir=${D}/usr/share/doc/${PF}
-
-	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
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
deleted file mode 100644
index 4fc861fc3760..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2005 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.16-r2.ebuild,v 1.4 2005/09/19 15:50:40 phosphan Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="usb gphoto2 ipv6 v4l"
-
-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 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${DEPEND}
-	>=sys-apps/sed-4"
-
-BROTHERMFCDRIVER="sane-${PV}-brother-driver.diff"
-
-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
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#   abaton agfafocus apple artec as6e avision bh canon canon630u coolscan
-#   coolscan2 dc25 dmc epson fujitsu genesys gt68xx hp leo matsushita microtek
-#   microtek2 mustek mustek_usb nec pie plustek plustek_pp ricoh s9036
-#   sceptre sharp sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp
-#   umax1220u artec_eplus48u ma1509 ibm hp5400 u12 sm3840 snapscan niash dc210 dc240
-#   pint net
-#
-# Note that some backends has specific dependencies which make the compilation
-# fail because not supported on your current platform.
-pkg_setup() {
-	enewgroup scanner
-
-	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
-
-	if [[ "${SANE_BACKENDS}" != "" ]]; then
-		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
-		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
-		use usb && SANE_BACKENDS="${SANE_BACKENDS} sm3600"
-	fi
-
-	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
-		einfo "You can use the variable SANE_BACKENDS to pick backends"
-		einfo "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	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 \
-		|| die "function_name fix failed"
-
-	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"
-		epatch ${FILESDIR}/libusbscanner-device-r1.patch
-		:
-	fi
-	epatch ${FILESDIR}/lide25.patch
-
-	# trouble with -ffast-math, see bug #103118
-	for file in backend/matsushita.c backend/sceptre.c backend/leo.c \
-		backend/sp15c.h backend/teco1.c backend/teco2.c backend/teco3.c \
-		backend/sp15c-scsi.h backend/dc210.c include/sane/sanei_backend.h; do
-			sed -e 's/__unused__/sane_unused__/g' -i ${file} || \
-				die "Could not apply __unused__-fix for ${file}"
-	done
-
-}
-
-src_compile() {
-	if use amd64; then
-		filter-flags -fstack-protector
-	fi
-	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 || die
-
-	if use usb; then
-		cd tools/hotplug
-		grep -v '^$' libsane.usermap > libsane.usermap.new
-		mv libsane.usermap.new libsane.usermap
-	fi
-}
-
-src_install () {
-	einstall docdir=${D}/usr/share/doc/${PF}
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	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
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild
deleted file mode 100644
index e6f78ebbf5af..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2005 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.16-r3.ebuild,v 1.1 2005/10/31 13:31:16 phosphan Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="usb gphoto2 ipv6 v4l"
-
-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 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${DEPEND}
-	>=sys-apps/sed-4"
-
-BROTHERMFCDRIVER="sane-${PV}-brother-driver.diff"
-
-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
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#   abaton agfafocus apple artec as6e avision bh canon canon630u coolscan
-#   coolscan2 dc25 dmc epson fujitsu genesys gt68xx hp leo matsushita microtek
-#   microtek2 mustek mustek_usb nec pie plustek plustek_pp ricoh s9036
-#   sceptre sharp sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp
-#   umax1220u artec_eplus48u ma1509 ibm hp5400 u12 sm3840 snapscan niash dc210 dc240
-#   pint net
-#
-# Note that some backends has specific dependencies which make the compilation
-# fail because not supported on your current platform.
-pkg_setup() {
-	enewgroup scanner
-
-	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
-
-	if [[ "${SANE_BACKENDS}" != "" ]]; then
-		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
-		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
-		use usb && SANE_BACKENDS="${SANE_BACKENDS} sm3600"
-	fi
-
-	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
-		einfo "You can use the variable SANE_BACKENDS to pick backends"
-		einfo "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	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 \
-		|| die "function_name fix failed"
-
-	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"
-		epatch ${FILESDIR}/libusbscanner-device-r1.patch
-		:
-	fi
-	epatch ${FILESDIR}/lide25-r1.patch
-
-	# trouble with -ffast-math, see bug #103118
-	for file in backend/matsushita.c backend/sceptre.c backend/leo.c \
-		backend/sp15c.h backend/teco1.c backend/teco2.c backend/teco3.c \
-		backend/sp15c-scsi.h backend/dc210.c include/sane/sanei_backend.h; do
-			sed -e 's/__unused__/sane_unused__/g' -i ${file} || \
-				die "Could not apply __unused__-fix for ${file}"
-	done
-
-}
-
-src_compile() {
-	if use amd64; then
-		filter-flags -fstack-protector
-	fi
-	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 || die
-
-	if use usb; then
-		cd tools/hotplug
-		grep -v '^$' libsane.usermap > libsane.usermap.new
-		mv libsane.usermap.new libsane.usermap
-	fi
-}
-
-src_install () {
-	einstall docdir=${D}/usr/share/doc/${PF}
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	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
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
index df9c0fdf171e..66daaaa4be07 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.16-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
@@ -1,22 +1,26 @@
 # Copyright 1999-2005 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.16-r1.ebuild,v 1.2 2005/08/22 10:44:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.17.ebuild,v 1.1 2005/12/19 14:32:40 phosphan Exp $
 
-inherit eutils flag-o-matic
+inherit eutils
 
 IUSE="usb gphoto2 ipv6 v4l"
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
 HOMEPAGE="http://www.sane-project.org/"
 
-DEPEND=">=media-libs/jpeg-6b
+RDEPEND=">=media-libs/jpeg-6b
 	amd64? ( sys-libs/libieee1284 )
 	x86? ( sys-libs/libieee1284 )
 	usb? ( dev-libs/libusb )
 	gphoto2? ( media-libs/libgphoto2 )
 	v4l? ( sys-kernel/linux-headers )"
 
-BROTHERMFCDRIVER="sane-${PV}-brother-driver.diff"
+DEPEND="${DEPEND}
+	>=sys-apps/sed-4"
+
+BROTHERMFCPATCHVER="1.0.16"
+BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
 
 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
@@ -28,16 +32,22 @@ KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64 ~alpha ~ia64"
 
 # To enable specific backends, define SANE_BACKENDS with the backends you want
 # in those:
-#   abaton agfafocus apple artec as6e avision bh canon canon630u coolscan
-#   coolscan2 dc25 dmc epson fujitsu genesys gt68xx hp leo matsushita microtek
-#   microtek2 mustek mustek_usb nec pie plustek plustek_pp ricoh s9036
-#   sceptre sharp sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp
-#   umax1220u artec_eplus48u ma1509 ibm hp5400 u12 sm3840 snapscan niash dc210 dc240
-#   pint net
+# 
+#         abaton agfafocus apple artec as6e avision bh canon
+#         canon630u coolscan coolscan2 dc25 dmc
+#         epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
+#         microtek2 mustek mustek_usb nec pie plustek
+#         plustek_pp ricoh s9036 sceptre sharp
+#         sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u
+#         artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840 hp4200
+#         sm3600
 #
 # Note that some backends has specific dependencies which make the compilation
 # fail because not supported on your current platform.
+
 pkg_setup() {
+	enewgroup scanner
+
 	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
 
 	if [[ "${SANE_BACKENDS}" != "" ]]; then
@@ -79,13 +89,11 @@ src_unpack() {
 		epatch ${WORKDIR}/${BROTHERMFCDRIVER}
 		sed -e 's/bh canon/bh brother canon/' -i configure || \
 			die "could not add 'brother' to backend list"
-		epatch ${FILESDIR}/libusbscanner-device-r1.patch
-		:
 	fi
+
 }
 
 src_compile() {
-	filter-flags -ffast-math
 	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
 	BACKENDS="${SANE_BACKENDS}" \
 	econf \
@@ -105,7 +113,9 @@ src_compile() {
 
 src_install () {
 	einstall docdir=${D}/usr/share/doc/${PF}
-
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
 	if use usb; then
 		cd tools/hotplug
 		insinto /etc/hotplug/usb
@@ -125,8 +135,3 @@ src_install () {
 	doins 30sane
 
 }
-
-pkg_preinst() {
-	enewgroup scanner
-}
-