--- /usr/portage/mail-client/evolution/evolution-2.3.8.ebuild	2005-08-23 15:16:00.000000000 +0200
+++ evolution-2.3.8-r1.ebuild	2005-08-26 14:16:00.316666000 +0200
@@ -9,8 +9,8 @@
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda spell ssl static"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="crypt firefox dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda spell ssl static"
 
 # Top stanza are ximian deps
 # Pango dependency required to avoid font rendering problems
@@ -39,11 +39,13 @@
 		>=app-pda/gnome-pilot-conduits-2 )
 	spell? ( >=app-text/gnome-spell-1.0.5 )
 	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? (
-		mozilla? ( www-client/mozilla )
-		!mozilla? (
-			>=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
+        ssl? (
+                || (
+                        mozilla? ( www-client/mozilla )
+                        firefox? ( >=www-client/mozilla-firefox-1.0.6-r6 )
+                        ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9.2 )
+                )
+        )
 	ldap? ( >=net-nds/openldap-2 )
 	kerberos? ( virtual/krb5 )
 	krb4? ( virtual/krb5 )
@@ -95,12 +97,12 @@
 	# <obz@gentoo.org>
 
 	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