--- /usr/portage/media-gfx/iscan/iscan-2.26.2.ebuild	2011-10-15 18:31:16.000000000 -0500
+++ iscan-2.28.0.2.ebuild	2011-11-14 09:49:58.386101496 -0600
@@ -1,19 +1,18 @@
 # 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.26.2.ebuild,v 1.5 2011/10/15 23:14:57 ssuominen Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="4"
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools versionator
 
-SRC_REV="1"  # revision used by upstream
+MY_P="${PN}_$(replace_version_separator 3 -)"
+MY_PV="$(get_version_component_range 1-3)"
 
 # 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-*,
@@ -23,11 +22,11 @@
 # TODO:
 # (re)add closed-source binary modules which are needed for some scanners.
 
-KEYWORDS="amd64 x86"
+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
+SRC_URI="http://linux.avasys.jp/drivers/iscan/${MY_PV}/${MY_P}.tar.gz
 	doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )"
 LICENSE="GPL-2 AVASYS"
 SLOT="0"
@@ -60,6 +59,8 @@
 	dev-util/pkgconfig
 	X? ( sys-devel/gettext )"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 src_prepare() {
 	local i
 
@@ -81,13 +82,16 @@
 
 	epatch "${FILESDIR}"/iscan-2.25.0-drop-ltdl.patch
 	epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
-	epatch "${FILESDIR}"/iscan-2.26.2-libpng15.patch
+	epatch "${FILESDIR}"/iscan-2.28.0.2-libpng15.patch
 
 	eautoreconf
 }
 
 src_configure() {
 	append-flags -D_GNU_SOURCE  # needed for 'strndup'
+        # Fix selector box bug 388073
+        replace-flags "-O[0-9s]" "-O1"
+
 	local myconf="--enable-dependency-reduction"
 
 	if use X; then