--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- xstroke-0.6-r1.ebuild
+++ xstroke-0.6-r2.ebuild
@@ -1,8 +1,10 @@ 
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/xstroke-0.6-r1.ebuild,v 1.6 2008/01/09 08:29:51 nelchael Exp $
 
-inherit eutils
+EAPI=4
+
+inherit autotools eutils
 
 DESCRIPTION="Gesture/Handwriting recognition engine for X"
 # Dead upstream?
@@ -12,30 +14,25 @@ 
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXtst
-	x11-libs/libX11
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
 	x11-libs/libXpm
 	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXft"
+	x11-libs/libXtst"
+
 DEPEND="${RDEPEND}
-	media-libs/freetype
-	media-libs/fontconfig
 	dev-util/pkgconfig
-	x11-proto/xextproto
-	x11-proto/inputproto
+	sys-devel/flex
+	virtual/yacc
 	x11-proto/xproto"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	epatch "${FILESDIR}/${P}-sigsegv_sprintf.patch"
+	epatch "${FILESDIR}/${P}-underlinking.patch"
 
-}
-
-src_install() {
-	make DESTDIR="${D}" BINDIR=/usr/bin install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	eautoreconf
 }