--- bitlbee-1.2.7.ebuild	2010-05-19 12:17:43.000000000 -0700
+++ bitlbee-1.2.8.ebuild	2010-07-11 15:11:28.322852410 -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.7.ebuild,v 1.1 2010/05/19 19:17:43 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/" \
@@ -80,7 +77,7 @@
 		configure || die "sed failed in configure"
 }
 
-src_compile() {
+src_configure() {
 	# ldap hard-disabled for now
 	local myconf="--ldap=0"
 
@@ -116,15 +113,13 @@
 	sed -i \
 		-e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \
 		Makefile.settings || die "sed failed"
-
-	emake || die "make failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	make install-etc DESTDIR="${D}" || die "install failed"
-	make install-doc DESTDIR="${D}" || die "install failed"
-	make install-dev DESTDIR="${D}" || die "install failed"
+	emake install DESTDIR="${D}" || die "install failed"
+	emake install-etc DESTDIR="${D}" || die "install failed"
+	emake install-doc DESTDIR="${D}" || die "install failed"
+	emake install-dev DESTDIR="${D}" || die "install failed"
 	keepdir /var/lib/bitlbee
 	fperms 700 /var/lib/bitlbee
 	fowners bitlbee:bitlbee /var/lib/bitlbee