--- jabberd2-2.2.8.ebuild	2009-05-08 08:24:09.000000000 -0700
+++ jabberd2-2.2.9.ebuild	2010-04-10 02:28:22.110916348 -0700
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.8.ebuild,v 1.1 2009/05/08 15:24:09 gentoofan23 Exp $
+# $Header: $
+
+EAPI="2"
 
 inherit db-use eutils flag-o-matic pam
 
@@ -31,8 +33,7 @@
 
 S="${WORKDIR}/jabberd-${PV}"
 
-src_compile() {
-
+src_configure() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
 	replace-flags -O[3s] -O2
 
@@ -62,8 +63,6 @@
 		$(use_enable sqlite) \
 		$(use_enable ssl) \
 		$(use_with zlib)
-	emake || die "make failed"
-
 }
 
 src_install() {
@@ -72,8 +71,8 @@
 	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
 	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
 
-	newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed"
-	newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed"
+	newinitd "${FILESDIR}/${PN}.init" jabberd || die "newinitd failed"
+	newpamd "${FILESDIR}/${PN}.pamd" jabberd || die "newpamd failed"
 
 	dodoc AUTHORS README UPGRADE
 	docinto tools
@@ -92,11 +91,9 @@
 	sed -i \
 		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
 		sm.xml* || die "sed failed"
-
 }
 
 pkg_postinst() {
-
 	if use pam; then
 		echo
 		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
@@ -106,5 +103,4 @@
 		echo
 		ebeep
 	fi
-
 }