--- /usr/portage/mail-client/evolution/evolution-2.2.1.1.ebuild	2005-06-17 15:35:42.000000000 -0400
+++ /usr/local/portage/mail-client/evolution/evolution-2.2.1.1-r1.ebuild	2005-06-25 03:03:58.000000000 -0400
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.1.1.ebuild,v 1.11 2005/06/17 19:09:11 ferdy Exp $
+# $Header: $
 
 inherit eutils gnome2 flag-o-matic alternatives
 
 DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-HOMEPAGE="http://ximian.com/products/evolution/"
+HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
 
 LICENSE="GPL-2"
 SLOT="2.0"
 KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
-IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda gstreamer mono"
+IUSE="ssl mozilla mozilla-firefox ldap doc spell ipv6 kerberos crypt nntp debug pda gstreamer mono"
 
 # Top stanza are ximian deps
 RDEPEND=">=gnome-extra/libgtkhtml-3.6.1
@@ -37,9 +37,13 @@
 		>=app-pda/gnome-pilot-conduits-2.0.10 )
 	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 )
+			mozilla-firefox? ( www-client/mozilla-firefox )
+			( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9.2 )
+		)
+	)
 	ldap? ( >=net-nds/openldap-2 )
 	kerberos? ( virtual/krb5 )
 	gstreamer? ( >=media-libs/gstreamer-0.8
@@ -114,6 +118,11 @@
 			NSPR_LIB=/usr/$(get_libdir)/mozilla
 			NSS_INC=/usr/$(get_libdir)/mozilla/include/nss
 			NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr
+		elif use mozilla-firefox ; then
+			NSS_LIB=/usr/${get_libdir}/MozillaFirefox
+			NSPR_LIB=/usr/${get_libdir}/MozillaFirefox
+			NSS_INC=/usr/${get_libdir}/MozillaFirefox/include/nss
+			NSPR_INC=/usr/${get_libdir}/MozillaFirefox/include/nspr
 		else
 			NSS_LIB=/usr/$(get_libdir)/nss
 			NSPR_LIB=/usr/$(get_libdir)/nspr