--- bitlbee-1.2.4-r1.ebuild	2010-02-28 07:48:42.000000000 -0800
+++ bitlbee-1.2.6.ebuild	2010-04-29 14:15:31.754763304 -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"
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl test +yahoo xinetd" # ldap - Bug 195758
+IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl test twitter +yahoo xinetd" # ldap - Bug 195758
 
 COMMON_DEPEND=">=dev-libs/glib-2.4
 	msn? ( gnutls? ( net-libs/gnutls )
@@ -36,7 +36,7 @@
 	elog "Note: Support for all IM protocols are controlled by use flags."
 	elog "      Make sure you've enabled the flags you want."
 	elog
-	confutils_require_any jabber msn oscar yahoo
+	confutils_require_any jabber msn oscar twitter yahoo
 
 	# At the request of upstream, die if MSN Messenger support is enabled
 	# but no SSL support has been enabled
@@ -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/" \
@@ -85,7 +82,7 @@
 	local myconf="--ldap=0"
 
 	# setup protocol, ipv6 and debug
-	for flag in debug ipv6 msn jabber oscar yahoo ; do
+	for flag in debug ipv6 msn jabber oscar twitter yahoo ; do
 		if use ${flag} ; then
 			myconf="${myconf} --${flag}=1"
 		else