--- /usr/portage/net-im/gajim/gajim-0.15-r2.ebuild	2012-05-14 14:54:57.000000000 +0400
+++ /usr/portage/local/net-im/gajim/gajim-0.15.1.ebuild	2012-09-10 19:05:55.951271168 +0400
@@ -16,7 +16,7 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gmail gnome kde idle jingle libnotify networkmanager nls spell srv X xhtml"
+IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv X xhtml"
 
 REQUIRED_USE="
 	libnotify? ( dbus )
@@ -42,14 +42,13 @@
 		libnotify? ( dev-python/notify-python )
 		avahi? ( net-dns/avahi[dbus,gtk,python] )
 		)
-	gmail? ( net-dns/bind-tools )
 	gnome? (
 		dev-python/libgnome-python
 		dev-python/gnome-keyring-python
 		dev-python/egg-python
 		)
 	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farsight2[python] )
+	jingle? ( net-libs/farstream[python] )
 	kde? ( kde-base/kwallet )
 	networkmanager? (
 			dev-python/dbus-python
@@ -70,8 +69,6 @@
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-plugin.patch \
-		"${FILESDIR}"/${P}-SA48695-2.patch \
 		"${FILESDIR}"/0.14-python-version.patch \
 		"${FILESDIR}"/0.14.1-testing.patch
 	echo '#!/bin/sh' > config/py-compile