Latest stable for x86, cleaned up old stuff.

17 files changed, 12 insertions, 526 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 445207c93fe7..efadeb8f50df 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.36 2004/05/11 15:47:14 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.37 2004/06/11 10:38:13 phosphan Exp $
+
+  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)
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 556b79d73ee3..ec3bf4573096 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,23 +1,9 @@
-MD5 e1409b30dc77729b44369c728a056abe sane-backends-1.0.14-r1.ebuild 1994
-MD5 776d5d6991d3116fe6aebaf58f7ec373 sane-backends-1.0.13.ebuild 1334
-MD5 ef7977957f713021006c126cea468bcb sane-backends-1.0.12-r2.ebuild 1949
-MD5 f14888031de69f897f1229acdc58f220 sane-backends-1.0.14-r3.ebuild 2190
-MD5 6a619352d6713a066391a2f72a4eaa2e sane-backends-1.0.13-r1.ebuild 1528
 MD5 d7ba0173d2aadb285b022cbb18de9fee sane-backends-1.0.13-r3.ebuild 1726
-MD5 d45fc67882b41fb4216736e05e68a067 sane-backends-1.0.14-r2.ebuild 2160
-MD5 48cea6f7e5d6e35a763664f7e42ad86d sane-backends-1.0.14.ebuild 1757
-MD5 3c271e30b38e0577aed279bb021288c8 sane-backends-1.0.13-r2.ebuild 1729
-MD5 233c49c18e18c785566baea7433a90d5 ChangeLog 6792
+MD5 629d386060bbd002bf33d09826efba55 sane-backends-1.0.14-r2.ebuild 2158
+MD5 c1d9bb51488eafab3634f2850ecc4818 ChangeLog 7144
 MD5 e3010e884705ab9dfe82a3663438d36b metadata.xml 383
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
 MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582
 MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472
-MD5 40af2cfe060d09555e45986b2b6b98bd files/digest-sane-backends-1.0.12-r2 143
-MD5 45cd2fdeb9fb53db4b301d508ee8e8b5 files/digest-sane-backends-1.0.13-r1 73
-MD5 aaa487bfd9548bb623e44db14bce3d0e files/digest-sane-backends-1.0.13-r2 157
 MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160
-MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r1 160
 MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r2 160
-MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r3 160
-MD5 45cd2fdeb9fb53db4b301d508ee8e8b5 files/digest-sane-backends-1.0.13 73
-MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14 160
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
deleted file mode 100644
index d7ed003a2936..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.12-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-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/files/digest-sane-backends-1.0.13 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.13
deleted file mode 100644
index d370ad91d755..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a158413180a752f8af6f11792154a42 sane-backends-1.0.13.tar.gz 3108639
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r1 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r1
deleted file mode 100644
index d370ad91d755..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a158413180a752f8af6f11792154a42 sane-backends-1.0.13.tar.gz 3108639
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r2 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r2
deleted file mode 100644
index ce9b09a3bb86..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.13-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a158413180a752f8af6f11792154a42 sane-backends-1.0.13.tar.gz 3108639
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14
deleted file mode 100644
index 3249e577723f..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r1 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r1
deleted file mode 100644
index 3249e577723f..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3
deleted file mode 100644
index 3249e577723f..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777
-MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727
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
deleted file mode 100644
index 3c2e8d44de42..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.12-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 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.6 2004/01/29 04:38:43 agriffis 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 amd64 ia64"
-
-
-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
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.13-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.13-r1.ebuild
deleted file mode 100644
index 2135610b2eef..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 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.13-r1.ebuild,v 1.3 2004/01/29 04:38:43 agriffis Exp $
-
-inherit eutils
-
-IUSE="usb"
-
-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*
-	usb? ( dev-libs/libusb )"
-
-SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
-
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	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
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || 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
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.13-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.13-r2.ebuild
deleted file mode 100644
index 40cc707e361a..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.13-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 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.13-r2.ebuild,v 1.3 2004/01/29 04:38:43 agriffis Exp $
-
-inherit eutils
-
-IUSE="usb"
-
-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*
-	usb? ( dev-libs/libusb )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.13-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 ~ppc ~sparc ~alpha ~amd64 ~ia64"
-
-
-src_unpack() {
-	unpack ${A}
-	use usb && unpack ${BROTHERMFCDRIVER}.bz2
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	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
-	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || 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
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.13.ebuild b/media-gfx/sane-backends/sane-backends-1.0.13.ebuild
deleted file mode 100644
index acf70129cb93..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 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.13.ebuild,v 1.2 2004/01/29 04:38:43 agriffis 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*"
-
-SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
-
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	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
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r1.ebuild
deleted file mode 100644
index bc859362f8b9..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.14-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 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.14-r1.ebuild,v 1.1 2004/05/06 13:15:54 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2"
-
-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*
-	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.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"
-
-
-src_unpack() {
-	unpack ${A}
-	use usb && unpack ${BROTHERMFCDRIVER}.bz2
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	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
-	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb) $(use_with gphoto2)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || die
-	make || die
-	cd tools/hotplug
-	grep < libsane.usermap -v '^$' > libsane.usermap.new
-	mv libsane.usermap.new libsane.usermap
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		install || die
-
-	cd tools/hotplug
-	insinto /etc/hotplug/usb
-	doins libsane.usermap libusbscanner
-	newdoc README README.hotplug
-	cd ../..
-
-	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.14-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r2.ebuild
index b1d600d5d277..461e0cf4cfae 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.14-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.14-r2.ebuild,v 1.1 2004/05/10 07:17:04 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.14-r2.ebuild,v 1.2 2004/06/11 10:38:13 phosphan Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz
 	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 
 src_unpack() {
diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
deleted file mode 100644
index d79786dbfea3..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.14-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2004 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.14-r3.ebuild,v 1.1 2004/05/11 15:47:14 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2"
-
-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*
-	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.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"
-
-
-src_unpack() {
-	unpack ${A}
-	use usb && unpack ${BROTHERMFCDRIVER}.bz2
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	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
-	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-	use usb && epatch ${FILESDIR}/libusbscanner-device.patch
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb) $(use_with gphoto2)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--enable-parport-directio \
-		--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 () {
-
-	enewgroup scanner
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		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
-
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.14.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14.ebuild
deleted file mode 100644
index 250396cd22e3..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.14.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2004 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.14.ebuild,v 1.1 2004/05/05 08:29:10 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2"
-
-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*
-	usb? ( dev-libs/libusb )
-	gphoto2? ( media-gfx/gphoto2 )"
-
-BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.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"
-
-
-src_unpack() {
-	unpack ${A}
-	use usb && unpack ${BROTHERMFCDRIVER}.bz2
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	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
-	use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER}
-}
-
-src_compile() {
-	local myconf
-	myconf="$(use_enable usb libusb) $(use_with gphoto2)"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} ${myconf} || 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
-
-}