--- /usr/portage/mail-client/evolution/evolution-2.4.2.1.ebuild	2005-12-08 21:07:12.000000000 +0100
+++ /usr/local/portage/mail-client/evolution/evolution-2.4.2.1.ebuild	2005-12-17 23:00:29.000000000 +0100
@@ -10,7 +10,7 @@
 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 nntp pda profile spell ssl"
+IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono nntp pda profile spamassassin spell ssl"
 
 # Pango dependency required to avoid font rendering problems
 RDEPEND=">=x11-themes/gnome-icon-theme-1.2
@@ -33,7 +33,7 @@
 	>=gnome-base/libgnome-2
 	>=net-libs/libsoup-2.2.2
 	>=x11-libs/pango-1.8.1
-	mail-filter/spamassassin
+	spamassassin? ( mail-filter/spamassassin )
 	pda? (
 		>=app-pda/gnome-pilot-2
 		>=app-pda/gnome-pilot-conduits-2 )
--- /usr/portage/profiles/use.local.desc	2005-12-17 23:36:11.000000000 +0100
+++ /usr/local/portage/profiles/use.local.desc	2005-12-18 14:55:23.000000000 +0100
@@ -478,6 +478,7 @@
 kde-base/ksysguard:zeroconf - Enable support for DNS Service Discovery (DNS-SD)
 mail-client/evolution:firefox - Use Firefox's NSS/NSPR libraries if SSL is enabled
 mail-client/evolution:nntp - Enable evolution nntp (news) functionality
+mail-client/evolution:spamassassin - Use spamassassin to filter junk mail
 mail-client/mail-notification:evolution - Provide an Evolution plugin
 mail-client/mail-notification:gmail - Enable Gmail mailbox checking
 mail-client/mail-notification:gmailtimestamps - Enable support for Gmail timestamps