--- libevent-2.0.3.ebuild	2010-01-14 13:35:30.000000000 -0800
+++ libevent-2.0.4.ebuild	2010-03-09 11:09:45.477009007 -0800
@@ -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/dev-libs/libevent/libevent-2.0.3.ebuild,v 1.2 2010/01/14 21:28:03 fauli Exp $
+# $Header: $
+
+EAPI="2"
 
 inherit libtool
 
@@ -24,9 +26,7 @@
 	prevver=$(best_version ${CATEGORY}/${PN})
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# don't waste time building tests/samples
 	sed -i \
 		-e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \