--- surfraw/surfraw-2.2.6.ebuild	2010-05-08 08:22:43.000000000 +0100
+++ surfraw/surfraw-2.2.7.ebuild	2010-05-08 08:35:30.000000000 +0100
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.6.ebuild,v 1.6 2010/01/10 20:25:08 maekke Exp $
 
+EAPI="2"
+
 inherit bash-completion eutils
 
 DESCRIPTION="A fast unix command line interface to WWW"
@@ -10,25 +12,21 @@ SRC_URI="http://${PN}.alioth.debian.org/
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo_pkg_tools.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch
 	# Man page symlinks shouldn't link to compressed files
 	sed -i 's,\.gz,,g' links.IN
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--with-elvidir='$(datadir)'/surfraw \
 		--disable-opensearch \
 		|| die "./configure failed"
-	emake || die "make failed"
 }
 
 src_install() {