--- httperf-0.9.0-r1.ebuild	2012-03-19 23:31:02.000000000 +0400
+++ httperf-0.9.0-r2.ebuild	2012-10-29 19:47:33.000000000 +0400
@@ -2,9 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-benchmarks/httperf/httperf-0.9.0-r1.ebuild,v 1.4 2012/03/19 19:06:37 armin76 Exp $
 
-EAPI=2
+EAPI=4
 
-inherit eutils autotools toolchain-funcs
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils toolchain-funcs
 
 DESCRIPTION="A tool from HP for measuring web server performance."
 HOMEPAGE="http://code.google.com/p/httperf/"
@@ -12,25 +15,19 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86"
+KEYWORDS="~amd64 ~amd64-linux ~mips ~x64-macos ~x86"
 IUSE="debug"
 
 DEPEND="dev-libs/openssl"
 RDEPEND="dev-libs/openssl"
 
-src_prepare() {
-	eautoconf || die "autoconf failed"
-}
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
 src_configure() {
-	econf --bindir=/usr/bin \
-		$(use_enable debug) \
-		|| die "econf failed"
-}
-src_compile() {
-	emake CC=$(tc-getCC) -j1 || die "emake failed"
+	econf --bindir="${EPREFIX}"/usr/bin \
+		$(use_enable debug)
 }
 
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+src_compile() {
+	emake CC="$(tc-getCC)" -j1
 }