--- evolution-data-server-1.2.1-r1.ebuild	2005-06-19 00:44:12.264285987 +0200
+++ evolution-data-server-1.2.1.ebuild	2005-06-25 13:12:08.982464113 +0200
@@ -9,8 +9,8 @@
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~ppc64"
-IUSE="doc ldap mozilla ssl ipv6 nntp kerberos"
+KEYWORDS="x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~ppc64"
+IUSE="doc ldap mozilla ssl ipv6 nntp kerberos firefox"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/libbonobo-2.4.2
@@ -21,16 +21,13 @@
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.2.2
 	ldap? ( >=net-nds/openldap-2.0 )
-        ssl? ( mozilla? ( !firefox? (
-                        www-client/mozilla ))
-                firefox? ( !mozilla? (
-                        www-client/mozilla-firefox ))
-                 !mozilla? ( !firefox? (
-                        >=dev-libs/nspr-4.4.1
-                        >=dev-libs/nss-3.9.2 ))
-                 !firefox? ( !mozilla? (
-                        >=dev-libs/nspr-4.4.1
-                        >=dev-libs/nss-3.9.2 )))
+        ssl? (
+                || (
+                        mozilla? ( www-client/mozilla )
+                        firefox? ( www-client/mozilla-firefox )
+                        ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9.2 )
+                )
+        )
 	kerberos? ( virtual/krb5 )"
 
 DEPEND="${RDEPEND}