--- gutenprint-5.2.5-r1.ebuild.orig	2010-03-07 13:53:53.000000000 +0100
+++ gutenprint-5.2.5-r1.ebuild	2010-03-07 19:40:59.000000000 +0100
@@ -6,12 +6,14 @@
 
 inherit autotools 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 )
@@ -24,9 +26,6 @@
 DEPEND="${RDEPEND}
 	gtk? ( dev-util/pkgconfig )"
 
-LICENSE="GPL-2"
-SLOT="0"
-
 src_prepare() {
 	# Respect gentoo CFLAGS
 	epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch"
@@ -56,26 +55,24 @@
 
 	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
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 
-	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
+	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