--- gutenprint-5.1.4.ebuild.orig	2010-03-07 13:52:58.000000000 +0100
+++ gutenprint-5.1.4.ebuild	2010-03-07 19:01:34.000000000 +0100
@@ -1,15 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.1.4.ebuild,v 1.5 2009/12/26 17:43:20 pva Exp $
 
 inherit flag-o-matic eutils multilib
 
-IUSE="cups foomaticdb gimp gtk readline ppds"
-
 DESCRIPTION="Ghostscript and cups printer drivers"
 HOMEPAGE="http://gutenprint.sourceforge.net"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="cups foomaticdb gimp gtk readline ppds"
 RESTRICT="test"
 
 RDEPEND="cups? ( >=net-print/cups-1.1.14 )
@@ -22,9 +24,6 @@
 DEPEND="${RDEPEND}
 	gtk? ( dev-util/pkgconfig )"
 
-LICENSE="GPL-2"
-SLOT="0"
-
 append-flags -fno-inline-functions
 
 src_compile() {
@@ -46,34 +45,32 @@
 
 	econf \
 		--enable-test \
-		--enable-epson \
 		--with-ghostscript \
-		--with-user-guide \
-		--with-samples \
-		--with-escputil \
+		--enable-samples \
+		--enable-escputil \
 		--disable-translated-cups-ppds \
 		--enable-nls \
 		$(use_with readline) \
 		$(use_with gimp gimp2) \
 		$(use_with gimp gimp2-as-gutenprint) \
 		$(use_with cups) \
-		$myconf || die "econf failed"
+		$myconf || die
 
 	# IJS Patch
 	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
 
-	emake || die "emake failed"
+	emake || die
 }
 
 src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	emake -j1 DESTDIR="${D}" install || die
 
 	exeinto /usr/share/gutenprint
-	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}
-
-	dodoc AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt}
-	dohtml doc/FAQ.html
-	dohtml -r doc/users_guide/html doc/developer/developer-html
+	doexe \
+		test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither} || die
+	dodoc \
+		AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} || die
+	dohtml doc/FAQ.html || die
 	rm -fR "${D}"/usr/share/gutenprint/doc
 	if ! use gtk && ! use gimp; then
 		rm -f "${D}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc