old

(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)

10 files changed, 8 insertions, 940 deletions

diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index 6942e6be653f..f96059b29161 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/iscan
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.45 2011/10/15 23:14:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.46 2011/10/16 17:50:43 ssuominen Exp $
+
+  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -iscan-2.11.0.ebuild,
+  -files/iscan-2.11.0-gcc43.patch, -files/iscan-2.11.0-glibc210.patch,
+  -files/iscan-2.11.0-libltdl.patch, -iscan-2.21.0.ebuild,
+  -files/iscan-2.21.0-drop-ltdl.patch, -files/iscan-2.21.0-fix-g++-test.patch,
+  -files/iscan-2.21.0-noinst-stuff.patch, -iscan-2.25.0.ebuild:
+  old
 
   15 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> iscan-2.26.2.ebuild:
   amd64 stable wrt #386021
diff --git a/media-gfx/iscan/files/iscan-2.11.0-gcc43.patch b/media-gfx/iscan/files/iscan-2.11.0-gcc43.patch
deleted file mode 100644
index 4766a1c7b7aa..000000000000
--- a/media-gfx/iscan/files/iscan-2.11.0-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- frontend/pisa_view_manager.h.orig	2008-06-11 15:02:57.215502256 +0200
-+++ frontend/pisa_view_manager.h	2008-06-11 15:03:10.813875095 +0200
-@@ -48,6 +48,8 @@
- 
- #include "file-selector.h"
- 
-+#include <string.h>
-+
- class view_manager
- {
-  public:
diff --git a/media-gfx/iscan/files/iscan-2.11.0-glibc210.patch b/media-gfx/iscan/files/iscan-2.11.0-glibc210.patch
deleted file mode 100644
index 0b02e5a17365..000000000000
--- a/media-gfx/iscan/files/iscan-2.11.0-glibc210.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- frontend/file-selector.cc
-+++ frontend/file-selector.cc
-@@ -35,6 +35,7 @@
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
-+#include <string>
- #include <unistd.h>
- 
- #include "pisa_aleart_dialog.h"
-@@ -1023,17 +1024,14 @@
-   // check write access to the directory (note that we need execute
-   // privileges as well)
- 
--  char *slash = strrchr( file, '/');
--  *slash = '\0';		// temporarily truncate to dirname
--  const char *dir = (file == slash
--		     ? "/"	// whoops!, file in root directory
--		     : file);
-+  const char *slash = strrchr( file, '/');
-+  std::string dir( file, slash - file);
-+  if (dir.empty())
-+    dir = "/";
- 
-   bool w_ok = false;		// assume the worst
--  if (0 == access( dir, F_OK ))
--    w_ok = (0 == access( dir, W_OK | X_OK ));
--
--  *slash = '/';			// restore filename
-+  if (0 == access( dir.c_str(), F_OK ))
-+    w_ok = (0 == access( dir.c_str(), W_OK | X_OK ));
- 
-   return w_ok;
- }
---- frontend/pisa_view_manager.cc
-+++ frontend/pisa_view_manager.cc
-@@ -45,6 +45,7 @@
- #include <sys/stat.h>
- #include <dirent.h>
- #include <locale.h>
-+#include <string>
- 
- /*------------------------------------------------------------*/
- #include "pisa_view_manager.h"
-@@ -1170,10 +1171,10 @@
- pisa_file_type
- view_manager::get_file_type (const char *filename)
- {
--  char *dot   = strrchr (filename, '.');
-+  const char *dot   = strrchr (filename, '.');
-   if (!dot)
-     {
--      char *slash = strrchr (filename, '/');
-+      const char *slash = strrchr (filename, '/');
-       if (   (strlen (slash) == strlen ("/" PACKAGE_TARNAME "XXXXXX"))
- 	  && (0 == strncmp (slash, "/" PACKAGE_TARNAME,
- 			    strlen ("/" PACKAGE_TARNAME))))
-@@ -1260,19 +1261,19 @@
- {
-   int cancel = 0;		// default: don't cancel
- 
--  char *slash = strrchr( regexp, '/' );
-+  const char *slash = strrchr( regexp, '/' );
- 
-   if (!slash)
-     return cancel = 1;
- 
--  *slash = '\0';		// regexp now holds the directory name
--  char dirname[ strlen( regexp )];
--  strcpy( dirname, regexp );
-+  std::string s( regexp, slash - regexp);
-+  char dirname[ s.size()];
-+  strcpy( dirname, s.c_str());
- 
--  *slash = '^';			// re-anchor the regexp
-+  s = std::string("^") + (slash + 1); // re-anchor the regexp
- 
-   regex_t *comp_regex = new regex_t;
--  int comp = regcomp( comp_regex, slash, REG_EXTENDED );
-+  int comp = regcomp( comp_regex, s.c_str(), REG_EXTENDED );
- 
-   if (0 == comp)
-     {
---- lib/imgstream.cc
-+++ lib/imgstream.cc
-@@ -185,7 +185,7 @@
-   return lt_dlclose (lib);
- }
- 
--static int reversionsort (const void*, const void*);
-+static int reversionsort (const dirent**, const dirent**);
- int selector (const dirent *);
- 				// forward declarations
- 
-@@ -321,7 +321,7 @@
- //! The C library's versionsort() function in reverse.
- static
- int
--reversionsort (const void *a, const void *b)
-+reversionsort (const dirent **a, const dirent **b)
- {
-   return versionsort (b, a);
- }
diff --git a/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch b/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch
deleted file mode 100644
index 5b767cfb8f07..000000000000
--- a/media-gfx/iscan/files/iscan-2.11.0-libltdl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -30,7 +30,10 @@ AC_SUBST(PACKAGE_RELEASE,1)		dnl  keep A
- 
- AC_CONFIG_HEADER([config.h])
- AC_CONFIG_SRCDIR([backend/epkowa.c])
-+dnl Detect old libtool
-+m4_ifndef([LT_OUTPUT], [
- AC_CONFIG_SUBDIRS([libltdl])
-+])
- 
- AM_INIT_AUTOMAKE([gnu 1.7])
- 
-@@ -196,10 +199,10 @@ dnl  The somewhat obscure LT_AC_PROG_SED
- dnl  SED environment variable gets set before it's used by the libtool
- dnl  machinery.  This works around buggy libtool versions.
- LT_AC_PROG_SED
--AC_LIB_LTDL
- AC_LIBLTDL_CONVENIENCE
- AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
-+AC_LIB_LTDL
- AC_SUBST(LTDLINCL)
- AC_SUBST(LIBLTDL)
- 
---- lib/imgstream.cc
-+++ lib/imgstream.cc
-@@ -211,6 +211,17 @@ int selector (const dirent *);
- imgstream::dl_handle
- imgstream::find_dlopen (const char *libname)
- {
-+// forward compatibility
-+#ifndef LTDL_SHLIB_EXT
-+#define LTDL_SHLIB_EXT LT_MODULE_EXT
-+#endif
-+#ifndef LTDL_SHLIBPATH_VAR
-+#define LTDL_SHLIBPATH_VAR LT_MODULE_PATH_VAR
-+#endif
-+#ifndef LTDL_SYSSEARCHPATH
-+#define LTDL_SYSSEARCHPATH LT_DLSEARCH_PATH 
-+#endif
-+
-   using std::bad_alloc;
- 
-   dl_handle result = NULL;
diff --git a/media-gfx/iscan/files/iscan-2.21.0-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.21.0-drop-ltdl.patch
deleted file mode 100644
index 10fc19fadd20..000000000000
--- a/media-gfx/iscan/files/iscan-2.21.0-drop-ltdl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: iscan-2.21.0/backend/Makefile.am
-===================================================================
---- iscan-2.21.0.orig/backend/Makefile.am
-+++ iscan-2.21.0/backend/Makefile.am
-@@ -60,7 +60,6 @@ noinst_LTLIBRARIES = \
- 
- libepkowa_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS) \
--	$(LTDLINCL) \
- 	-I$(top_srcdir)/include \
- 	-I$(top_srcdir)/non-free \
- 	-DV_MAJOR=$(SANE_MAJOR) -DV_MINOR=$(SANE_MINOR)
-@@ -68,7 +67,7 @@ libepkowa_la_LDFLAGS = \
- 	-static
- libepkowa_la_LIBADD = \
- 	-lm \
--	$(LIBLTDL)
-+	-lltdl
- libepkowa_la_SOURCES = \
- 	$(sane_backends_files) \
- 	marshal.c \
-Index: iscan-2.21.0/configure.ac
-===================================================================
---- iscan-2.21.0.orig/configure.ac
-+++ iscan-2.21.0/configure.ac
-@@ -237,14 +237,10 @@ AC_CHECK_FUNCS([\
- dnl  The somewhat obscure LT_AC_PROG_SED is here to make sure that the
- dnl  SED environment variable gets set before it's used by the libtool
- dnl  machinery.  This works around buggy libtool versions.
--LT_AC_PROG_SED
--AC_LIBLTDL_INSTALLABLE
--AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
-+AC_LTDL_SHLIBPATH
-+AC_LTDL_SHLIBEXT
-+AC_LTDL_SYSSEARCHPATH
--AC_LIB_LTDL
--AC_SUBST(LTDLINCL)
--AC_SUBST(LIBLTDL)
--
- 
- dnl  Graphic file format options
- 
-Index: iscan-2.21.0/frontend/Makefile.am
-===================================================================
---- iscan-2.21.0.orig/frontend/Makefile.am
-+++ iscan-2.21.0/frontend/Makefile.am
-@@ -34,7 +34,7 @@ iscan_CXXFLAGS = \
- iscan_LDADD = \
- 	$(top_builddir)/lib/libimage-stream.la \
- 	-lsane \
--	@LIBLTDL@ \
-+	-lltdl \
- 	@GTK_LIBS@ \
- 	@GDK_IMLIB_LIBS@ \
- 	$(top_builddir)/non-free/libesmod.so
-Index: iscan-2.21.0/lib/Makefile.am
-===================================================================
---- iscan-2.21.0.orig/lib/Makefile.am
-+++ iscan-2.21.0/lib/Makefile.am
-@@ -29,7 +29,7 @@ noinst_LTLIBRARIES = libimage-stream.la
- libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include
- libimage_stream_la_LDFLAGS = -static
- libimage_stream_la_LIBADD  = \
--	$(LIBLTDL) \
-+	-lltdl \
- 	$(top_builddir)/lib/pdf/libpdf.la
- libimage_stream_la_SOURCES = \
- 	$(libimage_stream_la_files)
diff --git a/media-gfx/iscan/files/iscan-2.21.0-fix-g++-test.patch b/media-gfx/iscan/files/iscan-2.21.0-fix-g++-test.patch
deleted file mode 100644
index 23fa6edd76b4..000000000000
--- a/media-gfx/iscan/files/iscan-2.21.0-fix-g++-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: iscan-2.21.0/configure.ac
-===================================================================
---- iscan-2.21.0.orig/configure.ac
-+++ iscan-2.21.0/configure.ac
-@@ -68,7 +68,7 @@ AC_PROG_CXX
- #  to be larger than that for the gcc-3.[23] packages (as long as both
- #  are distributed) for smooth upgrade paths.
- 
--if test x"$CXX" = xg++; then
-+if test "$GXX" = "yes"; then
-     AC_MSG_CHECKING([C++ ABI version])
-     CXX_ABI="`$CXX -E -dM - < /dev/null | $AWK '/GXX_ABI/ { print $3 }'`"
-     AC_MSG_RESULT([$CXX_ABI])
diff --git a/media-gfx/iscan/files/iscan-2.21.0-noinst-stuff.patch b/media-gfx/iscan/files/iscan-2.21.0-noinst-stuff.patch
deleted file mode 100644
index f7711ced3c8f..000000000000
--- a/media-gfx/iscan/files/iscan-2.21.0-noinst-stuff.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: iscan-2.21.0/utils/Makefile.am
-===================================================================
---- iscan-2.21.0.orig/utils/Makefile.am
-+++ iscan-2.21.0/utils/Makefile.am
-@@ -37,11 +37,11 @@ CLEANFILES = \
- ##  Created by $(top_srcdir)/configure because, unlike iscan-registry,
- ##  the make-policy-file script does not refer to any of the directory
- ##  variables.
--pkglib_SCRIPTS = \
-+noinst_SCRIPTS = \
- 	make-policy-file \
- 	fix-udev-rules
- 
--dist_pkgdata_DATA = \
-+dist_noinst_DATA = \
- 	sled10.custom.fdi \
- 	fdi.xsl
- 
diff --git a/media-gfx/iscan/iscan-2.11.0.ebuild b/media-gfx/iscan/iscan-2.11.0.ebuild
deleted file mode 100644
index 693441edfb26..000000000000
--- a/media-gfx/iscan/iscan-2.11.0.ebuild
+++ /dev/null
@@ -1,312 +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/iscan/iscan-2.11.0.ebuild,v 1.9 2011/03/29 12:22:06 angelos Exp $
-
-EAPI=1
-inherit eutils toolchain-funcs flag-o-matic autotools rpm
-
-SRC_REV="1"  # revision used by upstream
-
-# HINTS:
-# -> non-free modules are x86 only
-# -> isane frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# PLUGINS:
-# -> iscan-plugin-gt-7200 == Perfection 1250 PHOTO
-# -> iscan-plugin-gt-7300 == Perfection 1260 PHOTO
-# -> iscan-plugin-gt-9400 == Perfection 3170 PHOTO      (esfw32.bin)
-# -> iscan-plugin-gt-f500 == Perfection 2480/2580 PHOTO (esfw41.bin)
-# -> iscan-plugin-gt-f520 == Perfection 3490/3590 PHOTO (esfw52.bin)
-# -> iscan-plugin-gt-f600 == Perfection 4180 PHOTO      (esfw43.bin)
-# -> iscan-plugin-gt-x750 == Perfection 4490 PHOTO      (esfw54.bin)
-# -> iscan-plugin-gt-s600 == Perfection V10/V100 PHOTO  (esfw66.bin)
-# -> iscan-plugin-gt-f700 == Perfection V350 PHOTO      (esfw68.bin)
-# -> iscan-plugin-gt-f670 == Perfection V200 PHOTO      (esfw7A.bin)
-# -> iscan-plugin-gt-x770 == Perfection V500 PHOTO      (esfw7C.bin)
-# -> iscan-plugin-cx4400  == Stylus CX4300/CX4400/CX4450/CX5500/CX5600/DX4400/DX4450
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the
-# configure script ignores --disable-*, if the
-# corresponding lib is found on the system.
-# Furthermore, isane doesn't compile w/o libusb,
-# this should be fixed somehow.
-
-# available x86 plugins (will be assembled below)
-PLUGINS="
-	v1180/gt-7200-1.0.0-1
-	v1180/gt-7300-1.0.0-1
-	v1180/gt-9400-1.0.0-1
-	v1180/gt-f500-1.0.0-1
-	v1180/gt-f520-1.0.0-1
-	v1180/gt-f600-1.0.0-1
-	v1180/gt-x750-1.0.0-1
-	2.3.0/gt-f700-2.0.0-0
-	2.3.0/gt-s600-2.0.0-1
-	2.8.0/gt-f670-2.0.0-1
-	2.10.0/cx4400-2.0.0-0
-	2.11.0/gt-x770-2.1.0-0"
-
-# Firmware files within plugin RPMs
-FIRMWARE=(	"esfw41.bin Perfection 2480/2580 PHOTO"
-			"esfw32.bin Perfection 3170 PHOTO"
-			"esfw52.bin Perfection 3490/3590 PHOTO"
-			"esfw43.bin Perfection 4180 PHOTO"
-			"esfw54.bin Perfection 4490 PHOTO"
-			"esfw66.bin Perfection V10/V100 PHOTO"
-			"esfw68.bin Perfection V350 PHOTO"
-			"esfw7A.bin Perfection V200 PHOTO"
-			"esfw7C.bin Perfection V500 PHOTO" )
-
-SRC_GCC34="http://lx1.avasys.jp/iscan/${PV}/${PN}_${PV}-${SRC_REV}.tar.gz"
-BIN_GCC34=""
-
-for X in ${PLUGINS}; do
-	BIN_GCC34="${BIN_GCC34} http://lx1.avasys.jp/iscan/${X%%/*}/iscan-plugin-${X##*/}.c2.i386.rpm"
-done
-
-# feel free to add your arch, every non-x86
-# arch doesn't install any x86-only stuff.
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend and firmware)"
-HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
-SRC_URI="${SRC_GCC34} ${BIN_GCC34}"
-LICENSE="GPL-2 EAPL EPSON"
-SLOT="0"
-
-IUSE="X gimp unicode"
-IUSE_LINGUAS="de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-QA_TEXTRELS="
-	usr/lib/iscan/libesint41.so.2.0.0
-	usr/lib/iscan/libesint52.so.2.0.0"
-
-RDEPEND="media-gfx/sane-backends
-	media-libs/libpng
-	virtual/jpeg
-	>=sys-fs/udev-103
-	>=dev-libs/libusb-0.1.12
-	x86? (
-		X? (
-			sys-devel/gettext
-			x11-libs/gtk+:2
-			gimp? ( media-gfx/gimp )
-		)
-	)"
-DEPEND="${RDEPEND}"
-
-snapscan_firmware() {
-	local i
-	echo "#-------------- EPSON Image Scan! for Linux Scanner-Firmware --------------"
-	for i in "${FIRMWARE[@]}"; do
-		echo
-		echo "# ${i#* } (${i%% *})"
-		echo "#firmware /usr/share/iscan/${i%% *}"
-	done
-	echo
-	cat 2>/dev/null "${1}"
-}
-
-usermap_to_udev() {
-	local ACTION='MODE="0660", GROUP="scanner"'
-	local DEVICE='\1ATTRS{idVendor}=="\L\2\E", ATTRS{idProduct}=="\L\3\E"'
-	echo '# udev rules file for iscan devices (udev >= 0.98)'
-	echo '#'
-	echo 'ACTION!="add", GOTO="iscan_rules_end"'
-	echo 'SUBSYSTEM!="usb*", GOTO="iscan_rules_end"'
-	echo 'KERNEL=="lp[0-9]*", GOTO="iscan_rules_end"'
-	echo
-	sed -n -e "s|^\(# SEIKO EPSON.*\)|\1|p" \
-		-e "s|^\(#*\)i*scan-device *0x0003 *0x\([^ ]\+\) *0x\([^ ]\+\)*.*|${DEVICE}, ${ACTION}|p" "${1}"
-	echo
-	echo 'LABEL="iscan_rules_end"'
-}
-
-pkg_setup() {
-	local i
-	if ! use x86 && ( use X || use gimp ); then
-		ewarn
-		ewarn "The iscan application needs CSS x86-only libs and"
-		ewarn "thus can't be built currently. You can still use"
-		ewarn "'xscanimage', 'xsane' or 'kooka' with sane-epkowa"
-		ewarn "backend. But some low-end scanners are also not"
-		ewarn "supported, because they need these x86 libs, too."
-		ewarn
-	fi
-
-	# Select correct tarball for installed GCC. This is not a perfect
-	# solution and should be expanded to other working GCC versions.
-	einfo "GCC version: $(gcc-fullversion)"
-	case "$(gcc-version)" in
-		3.4|4.[01234])  # 4.x seems to work (tested with Perfection 3490 PHOTO)
-			MY_A="${SRC_GCC34##*/}"
-			for i in ${BIN_GCC34}; do MY_A="${MY_A} ${i##*/}"; done
-			;;
-		*)
-			if use x86; then
-				die "Your GCC version is not supported. You need either 3.4 or 4.x!"
-			else
-				MY_A="${SRC_GCC34##*/}"  # fallback to GCC 3.4, should not harm.
-				for i in ${BIN_GCC34}; do MY_A="${MY_A} ${i##*/}"; done
-			fi
-			;;
-	esac
-}
-
-src_unpack() {
-	local i
-
-	cd "${WORKDIR}"
-	for i in ${MY_A}; do
-		case "${i}" in
-			*.rpm)
-				echo ">>> Unpacking ${i}"
-				rpm_unpack "${DISTDIR}/${i}" || die "failure unpacking ${i}"
-				;;
-			*)
-				unpack "${i}"
-				;;
-		esac
-	done
-
-	cd "${S}"
-
-	# apply patches
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-libltdl.patch"
-
-	# convert japanese docs to UTF-8
-	if use unicode && use linguas_ja; then
-		for i in {NEWS,README}.ja non-free/*.ja.txt; do
-			if [ -f "${i}" ]; then
-				echo ">>> Converting ${i} to UTF-8"
-				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-			fi
-		done
-	fi
-
-	# disable iscan frontend + none-free modules
-	if ! ( use x86 && use X ); then
-		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
-			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
-		sed -i -e 's:^\([[:space:]]*\)frontend[[:space:]]*\\:\1\\:g' \
-			-e 's:^\([[:space:]]*\)non-free[[:space:]]*\\:\1\\:g' \
-			-e 's:^\([[:space:]]*\)po[[:space:]]*\\:\1\\:g' Makefile*
-		sed -i -e 's:iscan.1::g' doc/Makefile*
-	fi
-
-	# autotool stuff
-#	rm libltdl/acinclude.m4
-	rm m4/libtool.m4
-
-	epatch "${FILESDIR}/${P}-glibc210.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	append-flags -D_GNU_SOURCE  # needed for 'strndup'
-	# hint: dirty hack, look into 'configure.ac' for 'PACKAGE_CXX_ABI'
-	CXX="g++" econf --enable-jpeg --enable-png --with-pic || die "econf failed"
-	emake CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	local MY_LIB="/usr/$(get_libdir)"
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# --disable-static doesn't work, so we just remove obsolete static lib
-	sed -i -e "s:^\(old_library=\):# \1:g" "${D}${MY_LIB}/sane/libsane-epkowa.la"
-	rm -f "${D}${MY_LIB}/sane/libsane-epkowa.a"
-
-	# install scanner plugins (x86-only)
-	if use x86; then
-		dodir ${MY_LIB}/iscan
-		cp -df "${WORKDIR}"/usr/lib/iscan/* "${D}${MY_LIB}"/iscan/.
-	fi
-
-	# install scanner firmware (could be used by sane-backends)
-	insinto /usr/share/iscan
-	doins "${WORKDIR}"/usr/share/iscan/*
-
-	# install docs
-	dodoc AUTHORS NEWS README doc/epkowa.desc
-	use linguas_ja && dodoc NEWS.ja README.ja
-
-	# remove 'make-udev-rules', we use our own stuff below
-	rm -f "${D}usr/lib/iscan/make-udev-rules"
-
-	# install USB hotplug stuff
-	dodir /etc/udev/rules.d
-	usermap_to_udev utils/hotplug/iscan.usermap \
-		> "${D}etc/udev/rules.d/99-iscan.rules"
-
-	# install sane config
-	insinto /etc/sane.d
-	doins backend/epkowa.conf
-
-	# link iscan so it is seen as a plugin in gimp
-	if use x86 && use X && use gimp; then
-		local plugindir
-		if [ -x /usr/bin/gimptool ]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif [ -x /usr/bin/gimptool-2.0 ]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		else
-			die "Can't find GIMP plugin directory."
-		fi
-		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"
-	fi
-
-	# install desktop entry
-	if use x86 && use X; then
-		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-	fi
-}
-
-pkg_postinst() {
-	local i
-	local DLL_CONF="/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-	local SNAPSCAN_CONF="/etc/sane.d/snapscan.conf"
-	elog
-	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
-		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
-		elog "Then edit ${EPKOWA_CONF} to suit your needs."
-	else
-		echo "epkowa" >> ${DLL_CONF}
-		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	fi
-	elog
-	elog "You can also use the 'snapscan' backend if you have a recent"
-	elog "sane-backend installation. Firmware files for some newer"
-	elog "EPSON scanners were installed into /usr/share/iscan:"
-	elog
-	for i in "${FIRMWARE[@]}"; do
-		elog " ${i%% *}: ${i#* }"
-	done
-	elog
-	if ! grep 2>/dev/null -q "/usr/share/iscan/.*\.bin" "${SNAPSCAN_CONF}"; then
-		snapscan_firmware "${SNAPSCAN_CONF}" > "${SNAPSCAN_CONF}~~~" \
-		&& mv -f "${SNAPSCAN_CONF}~~~" "${SNAPSCAN_CONF}" \
-		|| rm -f "${SNAPSCAN_CONF}~~~"
-		elog "The firmware entries were added to ${SNAPSCAN_CONF}"
-	else
-		elog "Please edit ${SNAPSCAN_CONF} to suit your needs."
-	fi
-	elog "Hint: not all models are supported by 'snapscan' yet!"
-	elog
-	elog "You can check which backend fits best for your scanner:"
-	elog "http://www.sane-project.org/cgi-bin/driver.pl?manu=Epson&bus=any"
-	elog
-}
diff --git a/media-gfx/iscan/iscan-2.21.0.ebuild b/media-gfx/iscan/iscan-2.21.0.ebuild
deleted file mode 100644
index 8061e1f63c2c..000000000000
--- a/media-gfx/iscan/iscan-2.21.0.ebuild
+++ /dev/null
@@ -1,206 +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/iscan/iscan-2.21.0.ebuild,v 1.7 2011/03/29 12:22:06 angelos Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic autotools
-
-SRC_REV="6"  # revision used by upstream
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# feel free to add your arch, every non-x86
-# arch doesn't install any x86-only stuff.
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
-SRC_URI="http://linux.avasys.jp/drivers/iscan/${PV}/${PN}_${PV}-${SRC_REV}.tar.gz"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X gimp jpeg png tiff"
-IUSE_LINGUAS="de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-QA_TEXTRELS="usr/$(get_libdir)/iscan/lib*"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="media-gfx/sane-backends
-	>=sys-fs/udev-103
-	>=dev-libs/libusb-0.1.12
-	X? (
-		x11-libs/gtk+:2
-		gimp? ( media-gfx/gimp )
-		png? ( media-libs/libpng )
-		jpeg? ( virtual/jpeg )
-		tiff? ( media-libs/tiff )
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( sys-devel/gettext )"
-
-usermap_to_udev() {
-	echo '# udev rules file for iscan devices (udev >= 0.98)'
-	echo '#'
-	echo 'ACTION!="add", GOTO="iscan_rules_end"'
-	echo 'SUBSYSTEM!="usb*", GOTO="iscan_rules_end"'
-	echo 'KERNEL=="lp[0-9]*", GOTO="iscan_rules_end"'
-	echo
-
-	sed -n -e '
-		/^:model[[:space:]]*"[^"]/ {
-			# Create model name string
-			s|^:model[[:space:]]*"\([^"]\+\).*|# \1|
-
-			# Copy to hold buffer
-			h
-		}
-		/^:usbid[[:space:]]*"0x[[:xdigit:]]\+"[[:space:]]*"0x[[:xdigit:]]\+"/ {
-			# Append next line
-			N
-
-			# Check status
-			/\n:status[[:space:]]*:\(complete\|good\|untested\)/ {
-				# Exchange with hold buffer
-				x
-
-				# Print (model name string)
-				p
-
-				# Exchange with hold buffer
-				x
-
-					# Create udev command string
-				s|^:usbid[[:space:]]*"0x\([[:xdigit:]]\+\)"[[:space:]]*"0x\([[:xdigit:]]\+\)".*|ATTRS{idVendor}=="\1", ATTRS{idProduct}=="\2", MODE="0660", GROUP="scanner"|
-
-				# Print (udev command string)
-				p
-			}
-		}
-	' "${1}"
-
-	echo
-	echo 'LABEL="iscan_rules_end"'
-}
-
-src_prepare() {
-	local i
-
-	# convert japanese docs to UTF-8
-	if use linguas_ja; then
-		for i in {NEWS,README}.ja non-free/*.ja.txt; do
-			if [ -f "${i}" ]; then
-				echo ">>> Converting ${i} to UTF-8"
-				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-			fi
-		done
-	fi
-
-	# disable checks for gtk+
-	if ! use X; then
-		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
-			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
-	fi
-
-	epatch "${FILESDIR}"/${P}-drop-ltdl.patch
-	epatch "${FILESDIR}"/${P}-fix-g++-test.patch
-	epatch "${FILESDIR}"/${P}-noinst-stuff.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -D_GNU_SOURCE  # needed for 'strndup'
-	local myconf
-
-	if use X; then
-		myconf="--enable-frontend
-			$(use_enable gimp)
-			$(use_enable jpeg)
-			$(use_enable png)
-			$(use_enable tiff)"
-	else
-		myconf="--disable-frontend --disable-gimp
-			--disable-jpeg --disable-png --disable-tiff"
-	fi
-
-	econf --disable-static ${myconf}
-}
-
-src_install() {
-	local MY_LIB="/usr/$(get_libdir)"
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# install docs
-	dodoc AUTHORS NEWS README doc/epkowa.desc
-	use linguas_ja && dodoc NEWS.ja README.ja
-
-	# remove
-	rm -f "${D}usr/lib/iscan/make-udev-rules"
-
-	# install USB hotplug stuff
-	local USERMAP_FILE="doc/epkowa.desc"
-	if [ -f ${USERMAP_FILE} ]; then
-		dodir /etc/udev/rules.d
-		usermap_to_udev ${USERMAP_FILE} \
-			> "${D}etc/udev/rules.d/99-iscan.rules"
-	else
-		die "Can not find USB devices description file: ${USERMAP_FILE}"
-	fi
-
-	# install sane config
-	insinto /etc/sane.d
-	doins backend/epkowa.conf
-
-	# link iscan so it is seen as a plugin in gimp
-	if use X && use gimp; then
-		local plugindir
-		if [ -x /usr/bin/gimptool ]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif [ -x /usr/bin/gimptool-2.0 ]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		else
-			die "Can't find GIMP plugin directory."
-		fi
-		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"
-	fi
-
-	# install desktop entry
-	if use X; then
-		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-	fi
-}
-
-pkg_postinst() {
-	local i
-	local DLL_CONF="/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
-	elog
-	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
-		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
-		elog "Then edit ${EPKOWA_CONF} to suit your needs."
-	else
-		echo "epkowa" >> ${DLL_CONF}
-		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	fi
-}
diff --git a/media-gfx/iscan/iscan-2.25.0.ebuild b/media-gfx/iscan/iscan-2.25.0.ebuild
deleted file mode 100644
index fbde25b69477..000000000000
--- a/media-gfx/iscan/iscan-2.25.0.ebuild
+++ /dev/null
@@ -1,162 +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/iscan/iscan-2.25.0.ebuild,v 1.4 2011/03/29 12:22:06 angelos Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic autotools
-
-SRC_REV="1"  # revision used by upstream
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
-SRC_URI="http://linux.avasys.jp/drivers/iscan/${PV}/${PN}_${PV}-${SRC_REV}.tar.gz
-	doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X gimp jpeg png tiff doc"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_DT_HASH="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="media-gfx/iscan-data
-	media-gfx/sane-backends
-	>=sys-fs/udev-103
-	>=dev-libs/libusb-0.1.12
-	sys-libs/libieee1284
-	X? (
-		x11-libs/gtk+:2
-		gimp? ( media-gfx/gimp )
-		png? ( media-libs/libpng )
-		jpeg? ( virtual/jpeg )
-		tiff? ( media-libs/tiff )
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( sys-devel/gettext )"
-
-src_prepare() {
-	local i
-
-	# convert japanese docs to UTF-8
-	if use linguas_ja; then
-		for i in {NEWS,README}.ja non-free/*.ja.txt; do
-			if [ -f "${i}" ]; then
-				echo ">>> Converting ${i} to UTF-8"
-				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-			fi
-		done
-	fi
-
-	# disable checks for gtk+
-	if ! use X; then
-		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
-			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
-	fi
-
-	epatch "${FILESDIR}"/${P}-drop-ltdl.patch
-	epatch "${FILESDIR}"/${P}-fix-g++-test.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -D_GNU_SOURCE  # needed for 'strndup'
-	local myconf="--enable-dependency-reduction"
-
-	if use X; then
-		myconf="${myconf}
-			--enable-frontend
-			$(use_enable gimp)
-			$(use_enable jpeg)
-			$(use_enable png)
-			$(use_enable tiff)"
-	else
-		myconf="${myconf}
-			--disable-frontend --disable-gimp
-			--disable-jpeg --disable-png --disable-tiff"
-	fi
-
-	econf --disable-static ${myconf}
-}
-
-src_install() {
-	local MY_LIB="/usr/$(get_libdir)"
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# install docs
-	dodoc AUTHORS NEWS README
-	use linguas_ja && dodoc NEWS.ja README.ja
-
-	# install sane config
-	insinto /etc/sane.d
-	doins backend/epkowa.conf
-
-	# install extra docs
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}/userg_revL_e.pdf"
-	fi
-
-	# link iscan so it is seen as a plugin in gimp
-	if use X && use gimp; then
-		local plugindir
-		if [ -x /usr/bin/gimptool ]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif [ -x /usr/bin/gimptool-2.0 ]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		else
-			die "Can't find GIMP plugin directory."
-		fi
-		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"
-	fi
-
-	# install desktop entry
-	if use X; then
-		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-	fi
-}
-
-pkg_postinst() {
-	local i
-	local DLL_CONF="/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
-	elog
-	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
-		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
-		elog "Then edit ${EPKOWA_CONF} to suit your needs."
-	else
-		echo "epkowa" >> ${DLL_CONF}
-		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	fi
-}