--- bitlbee-1.2.4-r1.ebuild	2010-02-28 07:48:42.000000000 -0800
+++ bitlbee-1.2.5.ebuild	2010-04-02 18:40:02.430387658 -0700
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.4-r1.ebuild,v 1.1 2010/02/28 15:48:42 cedk Exp $
+# $Header: $
 
-EAPI="1"
+EAPI="2"
 inherit eutils toolchain-funcs confutils
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
@@ -65,10 +65,7 @@
 	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i \
 		-e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
 		-e "s/nobody/bitlbee/" \