--- /usr/portage/net-im/gajim/gajim-0.15.4.ebuild	2013-05-29 08:31:23.000000000 -0300
+++ /usr/local/portage/net-im/gajim/gajim-0.15.4.ebuild	2013-06-12 16:41:22.923998157 -0300
@@ -20,12 +20,13 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	libnotify? ( dbus )
-	avahi? ( dbus )"
+	avahi? ( dbus )
+	gnome? ( gnome-keyring )"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
@@ -50,9 +51,11 @@
 		)
 	gnome? (
 		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
 		dev-python/egg-python
 		)
+	gnome-keyring? (
+		dev-python/gnome-keyring-python
+		)
 	idle? ( x11-libs/libXScrnSaver )
 	jingle? ( net-libs/farstream:0.1[python] )
 	kde? ( kde-base/kwallet )