--- xpp-1.5.ebuild.orig	2010-03-13 13:56:20.000000000 +0100
+++ xpp-1.5.ebuild	2010-03-13 18:36:47.000000000 +0100
@@ -1,23 +1,27 @@
-# 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/xpp/xpp-1.5.ebuild,v 1.9 2009/12/16 18:00:44 flameeyes Exp $
 
 EAPI="1"
-inherit eutils
+
+inherit autotools eutils
+
+WANT_AUTOMAKE="1.4"
 
 DESCRIPTION="X Printing Panel"
-SRC_URI="mirror://sourceforge/cups/${P}.tar.gz"
 HOMEPAGE="http://cups.sourceforge.net/xpp/"
+SRC_URI="mirror://sourceforge/cups/${P}.tar.gz"
 
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
 
-DEPEND=">=net-print/cups-1.1.14
+DEPEND="net-print/cups
 	x11-libs/fltk:1.1
 	media-libs/jpeg
 	media-libs/libpng
+	sys-devel/automake:1.4
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
@@ -26,8 +30,12 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}"/xpp-gcc4.patch \
 		"${FILESDIR}"/xpp-glibc-2.10.patch
+	sed -i -e '/$(STRIP) .*/d' Makefile.am || die
+
+	eautomake || die
 }
 
 src_compile() {
@@ -35,13 +43,13 @@
 	export LDFLAGS="-L/usr/lib/fltk-1.1 -lfltk"
 	export CPPFLAGS="-I/usr/include/fltk-1.1"
 
-	econf || die "configure failed"
+	econf || die
 
 	# bug #297200
-	emake -j1 || die "make failed"
+	emake -j1 || die
 }
 
 src_install() {
-	einstall || die "make install failed"
-	dodoc ChangeLog README
+	einstall || die
+	dodoc ChangeLog README || die
 }