--- iperf-2.0.4.ebuild	2010-01-07 08:06:27.000000000 -0800
+++ iperf-2.0.5.ebuild	2010-07-20 17:53:38.919786042 -0700
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.4.ebuild,v 1.11 2010/01/07 15:48:39 fauli Exp $
+# $Header: $
+
+EAPI=2
 
 DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://iperf.sourceforge.net/"
@@ -8,22 +10,21 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="ipv6 threads debug"
 
 DEPEND=""
 RDEPEND=""
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable threads) \
 		$(use_enable debug debuginfo)
-	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc INSTALL README
 	dohtml doc/*
 	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die