--- /usr/portage/gnome-extra/evolution-data-server/evolution-data-server-1.3.7.ebuild	2005-08-18 00:00:43.000000000 +0200
+++ evolution-data-server-1.3.7-r1.ebuild	2005-08-26 14:16:14.153530750 +0200
@@ -9,7 +9,7 @@
 
 LICENSE="GPL-2 Sleepycat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc ipv6 kerberos krb4 ldap mozilla nntp ssl static"
 
 RDEPEND=">=dev-libs/glib-2.4
@@ -24,11 +24,14 @@
 	>=net-libs/libsoup-2.2.2
 	sys-libs/zlib
 	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? (
-		mozilla? ( www-client/mozilla )
-		!mozilla? (
-			>=dev-libs/nspr-4.4
-			>=dev-libs/nss-3.9 ) )
+        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 )
 	krb4? ( virtual/krb5 )"
 
@@ -54,12 +57,12 @@
 	# Openssl support doesn't work and has been disabled in cvs
 
 	if use ssl ; then
-		if  use mozilla ; then
-			NSS_LIB=/usr/$(get_libdir)/mozilla
-			NSPR_LIB=/usr/$(get_libdir)/mozilla
-			NSS_INC=/usr/$(get_libdir)/mozilla/include/nss
-			NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr
-		else
+                if  use mozilla || use firefox; then
+                        NSS_LIB=${MOZILLA_FIVE_HOME}
+                        NSPR_LIB=${MOZILLA_FIVE_HOME}
+                        NSS_INC=${MOZILLA_FIVE_HOME}/include/nss
+                        NSPR_INC=${MOZILLA_FIVE_HOME}/include/nspr
+                else
 			NSS_LIB=/usr/$(get_libdir)/nss
 			NSPR_LIB=/usr/$(get_libdir)/nspr
 			NSS_INC=/usr/include/nss