Removing obsolete versions + cleaner solution for TeX-font-problems.

(Portage version: 2.1.4.4)

12 files changed, 16 insertions, 889 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 47d058618ad6..66eaa1ec63bb 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.137 2008/04/14 23:20:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.138 2008/05/13 11:27:37 phosphan Exp $
+
+  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:
diff --git a/media-gfx/sane-backends/files/udev-rule-2.patch b/media-gfx/sane-backends/files/udev-rule-2.patch
deleted file mode 100644
index 372ce465a71c..000000000000
--- a/media-gfx/sane-backends/files/udev-rule-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: tools/sane-desc.c
-===================================================================
---- tools/sane-desc.c.orig
-+++ tools/sane-desc.c
-@@ -3151,7 +3151,7 @@ print_udev_header (void)
- 
-   printf 
-     ("#\n"
--     "# udev rules file for supported USB devices\n"
-+     "# udev rules file for supported USB and SCSI devices\n"
-      "#\n"
-      "# To add a USB device, add a rule to the list below between the SUBSYSTEM...\n"
-      "# and LABEL... lines.\n"
-@@ -3169,25 +3169,32 @@ print_udev_header (void)
- static void
- print_udev (void)
- {
-+  int commentlen;
-   usbid_type *usbid = create_usbids_table ();
- 
-   print_udev_header ();
-   printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
--  printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
-+  puts("SUBSYSTEMS==\"scsi\", ATTRS{type}==\"6\", MODE=\"660\", GROUP=\"scanner\"");
-+  printf ("SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libsane_rules_end\"\n\n");
-   while (usbid)
-     {
-       manufacturer_model_type * name = usbid->name;
- 
--      printf ("# ");
-+      commentlen = printf ("# ");
-       while (name)
- 	{
--	  if (name != usbid->name)
--	    printf (" | ");
--	  printf ("%s", name->name);
-+	  if (name != usbid->name) {
-+	    commentlen += printf (" | ");
-+	  }  
-+	  if(commentlen + strlen(name->name) > 480) {
-+		  printf(" (line too long, names omitted)");
-+		  break;
-+	  }
-+	  commentlen += printf ("%s", name->name);
- 	  name = name->next;
- 	}
-       printf ("\n");
--      printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
-+      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
- 	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
-       usbid = usbid->next;
-     }
diff --git a/media-gfx/sane-backends/files/udev-rule-3.patch b/media-gfx/sane-backends/files/udev-rule-3.patch
deleted file mode 100644
index 2daf62098ffd..000000000000
--- a/media-gfx/sane-backends/files/udev-rule-3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: tools/sane-desc.c
-===================================================================
---- tools/sane-desc.c.orig
-+++ tools/sane-desc.c
-@@ -3151,7 +3151,7 @@ print_udev_header (void)
- 
-   printf 
-     ("#\n"
--     "# udev rules file for supported USB devices\n"
-+     "# udev rules file for supported USB and SCSI devices\n"
-      "#\n"
-      "# To add a USB device, add a rule to the list below between the SUBSYSTEM...\n"
-      "# and LABEL... lines.\n"
-@@ -3169,25 +3169,32 @@ print_udev_header (void)
- static void
- print_udev (void)
- {
-+  int commentlen;
-   usbid_type *usbid = create_usbids_table ();
- 
-   print_udev_header ();
-   printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
--  printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
-+  puts("SUBSYSTEMS==\"scsi\", ATTRS{type}==\"6\", MODE=\"660\", GROUP=\"scanner\"");
-+  printf ("SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libsane_rules_end\"\n\n");
-   while (usbid)
-     {
-       manufacturer_model_type * name = usbid->name;
- 
--      printf ("# ");
-+      commentlen = printf ("# ");
-       while (name)
- 	{
--	  if (name != usbid->name)
--	    printf (" | ");
--	  printf ("%s", name->name);
-+	  if (name != usbid->name) {
-+	    commentlen += printf (" | ");
-+	  }  
-+	  if(commentlen + strlen(name->name) > 480) {
-+		  printf(" (line too long, names omitted)");
-+		  break;
-+	  }
-+	  commentlen += printf ("%s", name->name);
- 	  name = name->next;
- 	}
-       printf ("\n");
--      printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
-+      printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",
- 	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2);
-       usbid = usbid->next;
-     }
diff --git a/media-gfx/sane-backends/files/udev-rule.patch b/media-gfx/sane-backends/files/udev-rule.patch
deleted file mode 100644
index 894f47e6677f..000000000000
--- a/media-gfx/sane-backends/files/udev-rule.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- tools/sane-desc.c	2006-07-31 08:57:40.000000000 +0200
-+++ tools/sane-desc-new.c	2006-07-31 09:10:50.000000000 +0200
-@@ -3151,7 +3151,7 @@
- 
-   printf 
-     ("#\n"
--     "# udev rules file for supported USB devices\n"
-+     "# udev rules file for supported USB and SCSI devices\n"
-      "#\n"
-      "# To add a USB device, add a rule to the list below between the SUBSYSTEM...\n"
-      "# and LABEL... lines.\n"
-@@ -3169,21 +3169,28 @@
- static void
- print_udev (void)
- {
-+  int commentlen;
-   usbid_type *usbid = create_usbids_table ();
- 
-   print_udev_header ();
-   printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n");
-+  puts("BUS==\"scsi\", SYSFS{type}==\"6\", MODE=\"660\", GROUP=\"scanner\"");
-   printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libsane_rules_end\"\n\n");
-   while (usbid)
-     {
-       manufacturer_model_type * name = usbid->name;
- 
--      printf ("# ");
-+      commentlen = printf ("# ");
-       while (name)
- 	{
--	  if (name != usbid->name)
--	    printf (" | ");
--	  printf ("%s", name->name);
-+	  if (name != usbid->name) {
-+	    commentlen += printf (" | ");
-+	  }  
-+	  if(commentlen + strlen(name->name) > 480) {
-+		  printf(" (line too long, names omitted)");
-+		  break;
-+	  }
-+	  commentlen += printf ("%s", name->name);
- 	  name = name->next;
- 	}
-       printf ("\n");
diff --git a/media-gfx/sane-backends/sane-backends-1.0.17.ebuild b/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
index dd83e7354e21..0259bb1c5602 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.17.ebuild,v 1.14 2008/02/11 10:33:11 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.17.ebuild,v 1.15 2008/05/13 11:27:37 phosphan Exp $
 
 inherit eutils
 
@@ -78,9 +78,6 @@ src_unpack() {
 
 	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"
@@ -102,7 +99,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		${myconf} || die "econf failed"
 
-	emake || die
+	emake VARTEXFONTS="${T}/fonts" || die
 
 	if use usb; then
 		cd tools/hotplug
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
deleted file mode 100644
index f40db44f3041..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r2.ebuild,v 1.13 2008/02/11 10:33:11 phosphan Exp $
-
-inherit eutils
-
-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-0.1.8 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-BROTHERMFCPATCHVER="1.0.18"
-BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
-
-# Could not access via ftp on 2006-07-20
-SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#
-# abaton agfafocus apple artec as6e avision bh brother canon
-# canon630u coolscan coolscan2 dc25 dmc
-# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
-# microtek2 mustek mustek_usb nec pie pixma 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 hp3500 stv680"
-
-# 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
-		elog "You can use the variable SANE_BACKENDS to pick backends"
-		elog "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	cd "${S}"
-
-	#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
-
-	if use usb; then
-		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
-		sed -e 's/bh canon/bh brother canon/' -i configure || \
-			die "could not add 'brother' to backend list"
-	fi
-	epatch "${FILESDIR}/udev-rule.patch"
-	epatch "${FILESDIR}/broken_coolscan.patch"
-}
-
-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 () {
-	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="/usr/share/doc/${PF}"
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-	if use usb; then
-		cd tools/hotplug
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins libsane.usermap
-		doexe libusbscanner
-		newdoc README README.hotplug
-		echo >> "${D}/etc/env.d/30sane" "USB_DEVFS_PATH=/dev/bus/usb"
-		cd ../..
-	fi
-	cd tools/udev
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
-	newins libsane.rules 99-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.18-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild
deleted file mode 100644
index 2562e69fda9c..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r3.ebuild,v 1.4 2008/02/11 10:33:11 phosphan Exp $
-
-inherit eutils
-
-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-0.1.8 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114"
-
-BROTHERMFCPATCHVER="1.0.18"
-BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
-
-# Could not access via ftp on 2006-07-20
-SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#
-# abaton agfafocus apple artec as6e avision bh brother canon
-# canon630u coolscan coolscan2 dc25 dmc
-# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
-# microtek2 mustek mustek_usb nec pie pixma 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 hp3500 stv680"
-
-# 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
-		elog "You can use the variable SANE_BACKENDS to pick backends"
-		elog "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	cd "${S}"
-
-	#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
-
-	if use usb; then
-		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
-		sed -e 's/bh canon/bh brother canon/' -i configure || \
-			die "could not add 'brother' to backend list"
-	fi
-	epatch "${FILESDIR}/udev-rule-2.patch"
-	epatch "${FILESDIR}/broken_coolscan.patch"
-}
-
-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 () {
-	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="/usr/share/doc/${PF}"
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-	if use usb; then
-		cd tools/hotplug
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins libsane.usermap
-		doexe libusbscanner
-		newdoc README README.hotplug
-		echo >> "${D}/etc/env.d/30sane" "USB_DEVFS_PATH=/dev/bus/usb"
-		cd ../..
-	fi
-	cd tools/udev
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
-	newins libsane.rules 99-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.18-r4.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild
deleted file mode 100644
index 4ff8d4e1ff7e..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r4.ebuild,v 1.8 2008/02/11 10:33:11 phosphan Exp $
-
-inherit eutils
-
-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-0.1.8 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114"
-
-BROTHERMFCPATCHVER="1.0.18"
-BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
-
-# Could not access via ftp on 2006-07-20
-SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#
-# abaton agfafocus apple artec as6e avision bh brother canon
-# canon630u coolscan coolscan2 dc25 dmc
-# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
-# microtek2 mustek mustek_usb nec pie pixma 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 hp3500 stv680"
-
-# 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
-		elog "You can use the variable SANE_BACKENDS to pick backends"
-		elog "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	cd "${S}"
-
-	#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
-
-	if use usb; then
-		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
-		sed -e 's/bh canon/bh brother canon/' -i configure || \
-			die "could not add 'brother' to backend list"
-	fi
-	epatch "${FILESDIR}/udev-rule-3.patch"
-	epatch "${FILESDIR}/broken_coolscan.patch"
-}
-
-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 () {
-	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="/usr/share/doc/${PF}"
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-	if use usb; then
-		cd tools/hotplug
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins libsane.usermap
-		doexe libusbscanner
-		newdoc README README.hotplug
-		echo >> "${D}/etc/env.d/30sane" "USB_DEVFS_PATH=/dev/bus/usb"
-		cd ../..
-	fi
-	cd tools/udev
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
-	newins libsane.rules 99-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.18-r5.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
deleted file mode 100644
index 051bd89a1e84..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r5.ebuild,v 1.3 2008/02/11 10:33:11 phosphan Exp $
-
-inherit eutils
-
-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-0.1.8 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114"
-
-BROTHERMFCPATCHVER="1.0.18"
-BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
-
-# Could not access via ftp on 2006-07-20
-SRC_URI="http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-		http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-#
-# abaton agfafocus apple artec as6e avision bh brother canon
-# canon630u coolscan coolscan2 dc25 dmc
-# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
-# microtek2 mustek mustek_usb nec pie pixma 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 hp3500 stv680"
-
-# 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
-		elog "You can use the variable SANE_BACKENDS to pick backends"
-		elog "instead of building all of them."
-	fi
-	unpack ${A}
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	cd "${S}"
-
-	#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
-
-	if use usb; then
-		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
-		sed -e 's/bh canon/bh brother canon/' -i configure || \
-			die "could not add 'brother' to backend list"
-	fi
-	epatch "${FILESDIR}"/udev-rule-4.patch
-	epatch "${FILESDIR}"/broken_coolscan.patch
-}
-
-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 () {
-	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF}
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-	if use usb; then
-		cd tools/hotplug
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins libsane.usermap
-		doexe libusbscanner
-		newdoc README README.hotplug
-		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
-		cd ../..
-	fi
-	cd tools/udev
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
-	newins libsane.rules 70-libsane.rules
-	cd ../..
-
-	dodoc NEWS AUTHORS ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild b/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
index ca75f415e3de..76c3604086e4 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild,v 1.7 2008/04/14 23:20:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.18-r6.ebuild,v 1.8 2008/05/13 11:27:37 phosphan Exp $
 
 inherit eutils
 
@@ -92,10 +92,6 @@ src_unpack() {
 
 	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
-
 	if ! use doc; then
 		sed -i -e 's:@USE_LATEX@:no:' doc/Makefile.in
 	fi
@@ -118,7 +114,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		${myconf} || die "econf failed"
 
-	emake || die
+	emake VARTEXFONTS="${T}/fonts" || die
 
 	if use usb; then
 		cd tools/hotplug
diff --git a/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild
index 94a9c000929d..a4df3d198a9a 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild,v 1.2 2008/04/08 08:44:50 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild,v 1.3 2008/05/13 11:27:37 phosphan Exp $
 
 inherit eutils
 
@@ -89,10 +89,6 @@ src_unpack() {
 
 	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
-
 	if ! use doc; then
 		sed -i -e 's:@USE_LATEX@:no:' doc/Makefile.in
 	fi
@@ -119,7 +115,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		${myconf} || die "econf failed"
 
-	emake || die
+	emake VARTEXFONTS="${T}/fonts" || die
 
 	if use usb; then
 		cd tools/hotplug
diff --git a/media-gfx/sane-backends/sane-backends-1.0.19.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19.ebuild
deleted file mode 100644
index 2ef9b6110c26..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.19.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19.ebuild,v 1.2 2008/04/08 08:44:50 phosphan Exp $
-
-inherit eutils
-
-IUSE="usb gphoto2 ipv6 v4l doc"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-
-RDEPEND=">=media-libs/jpeg-6b
-	amd64? ( sys-libs/libieee1284 )
-	x86? ( sys-libs/libieee1284 )
-	usb? ( >=dev-libs/libusb-0.1.8 )
-	gphoto2? ( media-libs/libgphoto2 )
-	v4l? ( sys-kernel/linux-headers )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		|| ( app-text/tetex
-				(
-					app-text/texlive
-					dev-texlive/texlive-latexextra
-				)
-			)
-	)
-	>=sys-apps/sed-4"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-114"
-
-BROTHERMFCPATCHVER="1.0.19"
-BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff"
-
-# Could not access via ftp on 2006-07-20
-SRC_URI="http://alioth.debian.org/frs/download.php/2318/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
-	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz
-	usb? ( 	mirror://gentoo/${BROTHERMFCDRIVER}.bz2
-			http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )"
-SLOT="0"
-LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# To enable specific backends, define SANE_BACKENDS with the backends you want
-# in those:
-# abaton agfafocus apple artec as6e avision bh brother canon
-# canon630u coolscan coolscan2 dc25 dmc epjitsu
-# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek
-# microtek2 mustek mustek_usb nec pie pixma plustek_pp
-# ricoh s9036 sceptre sharp
-# sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u
-# artec_eplus48u ma1509 ibm hs2p hp5400 u12 snapscan niash sm3840 hp4200
-# sm3600 hp3500 stv680 epson2 hp5590 hp3900 hpljm1005"
-
-# Note that some backends has specific dependencies which make the compilation
-# fail because not supported on your current platform.
-
-pkg_setup() {
-	enewgroup scanner
-
-	if [[ "${SANE_BACKENDS}" != "" ]]; then
-		use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2"
-		use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l"
-	fi
-	IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp"
-	if ! use x86 && ! use amd64; then
-		tmp="${SANE_BACKENDS}"
-		for backend in ${IEEE1284_BACKENDS}; do
-			if [[ "${tmp/$backend/}" != "${SANE_BACKENDS}" ]]; then
-				ewarn "You selected a backend which is disabled because it's not usable in your arch."
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [ -z "${SANE_BACKENDS}" ]; then
-		elog "You can use the variable SANE_BACKENDS to pick backends"
-		elog "instead of building all of them."
-	fi
-	unpack ${A}
-
-	if use usb; then
-		unpack ${BROTHERMFCDRIVER}.bz2
-	fi
-
-	cd "${S}"
-
-	#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
-
-	if ! use doc; then
-		sed -i -e 's:@USE_LATEX@:no:' doc/Makefile.in
-	fi
-
-	if use usb; then
-		epatch "${WORKDIR}/${BROTHERMFCDRIVER}"
-		sed -e 's/bh canon/bh brother canon/' -i configure || \
-			die "could not add 'brother' to backend list"
-	fi
-	epatch "${FILESDIR}"/udev-rule-5.patch
-	epatch "${FILESDIR}"/fujitsu_DBG_LEVEL.patch
-	cat >> backend/dll.conf.in <<-EOF
-	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
-	#hpaio
-	EOF
-}
-
-src_compile() {
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${SANE_BACKENDS}" \
-	econf \
-		$(use_enable usb libusb) \
-		$(use_with gphoto2) \
-		$(use_enable ipv6) \
-		${myconf} || die "econf failed"
-
-	emake || die
-
-	if use usb; then
-		cd tools/hotplug
-		grep -v '^$' libsane.usermap > libsane.usermap.new
-		mv libsane.usermap.new libsane.usermap
-	fi
-}
-
-src_install () {
-	make INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF}
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-	if use usb; then
-		cd tools/hotplug
-		insinto /etc/hotplug/usb
-		exeinto /etc/hotplug/usb
-		doins libsane.usermap
-		doexe libusbscanner
-		newdoc README README.hotplug
-		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
-		cd ../..
-	fi
-	cd tools/udev
-	dodir /etc/udev/rules.d
-	insinto /etc/udev/rules.d
-	newins libsane.rules 70-libsane.rules
-	cd ../..
-	dodoc NEWS AUTHORS ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
-}