bump to 2.20.0 and fix QA warnings

Package-Manager: portage-2.1.3.12

8 files changed, 215 insertions, 26 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 46d45af99939..c78d1892075b 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.202 2007/09/27 11:56:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.203 2007/10/12 14:40:18 eva Exp $
+
+  12 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  evolution-2.8.3-r2.ebuild, evolution-2.10.2.ebuild,
+  evolution-2.10.3.ebuild:
+  fix QA warnings
+
+*evolution-2.12.0 (12 Oct 2007)
+
+  12 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/evolution-2.11.90-mail-remote-broken.patch,
+  +evolution-2.12.0.ebuild:
+  bump to 2.12.0, bogofilter & spamassasin are pure runtime dependency so
+  removed them
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> evolution-2.10.3.ebuild:
   alpha/ia64 stable wrt #193339
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index aac3d80dd1bd..a6516697c72a 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -6,6 +6,10 @@ AUX evolution-2.10.2-fbsd.patch 1094 RMD160 d1e2ff1fe20f39ea7b2f812ae655f6782485
 MD5 614305851a89fd1fa35c24adbf35838e files/evolution-2.10.2-fbsd.patch 1094
 RMD160 d1e2ff1fe20f39ea7b2f812ae655f6782485de93 files/evolution-2.10.2-fbsd.patch 1094
 SHA256 226e248ce85db7f6eec28b31e8b69b2adf82e93a11672ee82e0599623247f092 files/evolution-2.10.2-fbsd.patch 1094
+AUX evolution-2.11.90-mail-remote-broken.patch 593 RMD160 45bb90d005b41d4d5da73967208ffd79c0c0c233 SHA1 3250db48ac6bae8c7136c53b8f217f56ecb9d22c SHA256 a1981bb926518144536c503cc1d7a18f939aebcbc6131b86583f60f75aefd2c9
+MD5 9a152edeac9ef4e79ca4427dae8976c1 files/evolution-2.11.90-mail-remote-broken.patch 593
+RMD160 45bb90d005b41d4d5da73967208ffd79c0c0c233 files/evolution-2.11.90-mail-remote-broken.patch 593
+SHA256 a1981bb926518144536c503cc1d7a18f939aebcbc6131b86583f60f75aefd2c9 files/evolution-2.11.90-mail-remote-broken.patch 593
 AUX evolution-2.3.7-configure_plugins.patch 3010 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 SHA1 8b996b3a578dcc593c752e240c01516d5ee5c2f9 SHA256 c7aa48137fff3e4f8d8fe0d466ff70e6feadb95ed07402273318d111b8ee3c70
 MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 files/evolution-2.3.7-configure_plugins.patch 3010
@@ -52,24 +56,29 @@ RMD160 c8bc0e84a77b43a705ad00c7db5b93a1f1dcaabc files/evolution-2.9.91-cal-reply
 SHA256 5837a56bf1079f2e703d6cc5316425f583ae4975a977a2ec80684962f1be826f files/evolution-2.9.91-cal-reply.patch 1679
 DIST evolution-2.10.2.tar.bz2 22143502 RMD160 9abeb8ac015e552ea02db2c48f926bb3befb3b11 SHA1 457b184db3aea02eff3ab14c27c55748af37e958 SHA256 8d5aae3090f40605151010a359ffa61987b9abe3b30fffd77256dba0a9f8c9b0
 DIST evolution-2.10.3.tar.bz2 26041499 RMD160 f3355a880c010975b1f1c1aa8221abc72bf54788 SHA1 dd6335ef7bf72745ff8f43f012093e89e9a5c35a SHA256 8a26b982a6af83ffa72a33e8d9b890c278d28a86765098006c65060eb021a16f
+DIST evolution-2.12.0.tar.bz2 25562079 RMD160 238c92d0fef5478bc6a51312ab8c68b970e9db98 SHA1 328707ae644a0bfeef96cc5bbf1f23133b61bcfd SHA256 f1b9fc4f02d297c797bf3953f0742f745efc2c0ebb893d126c0e3a9bac84fe56
 DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
 DIST evolution-2.8.3.tar.bz2 12931527 RMD160 cbf86ecbee7619f54ea6e60780d5c182208c5bf3 SHA1 afde414298d65ec344f52648c1915629bf7b79c3 SHA256 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90
-EBUILD evolution-2.10.2.ebuild 6538 RMD160 615d529088878ed1693e4b60bd31fd988a74586d SHA1 0c121171e0643f9bcccab45861161c002b6581b5 SHA256 734320e9921ee6f0aefbcc8213b48ebba102e42302086855656724b6031caec6
-MD5 e43b72586360e8515f727fdf3e11239e evolution-2.10.2.ebuild 6538
-RMD160 615d529088878ed1693e4b60bd31fd988a74586d evolution-2.10.2.ebuild 6538
-SHA256 734320e9921ee6f0aefbcc8213b48ebba102e42302086855656724b6031caec6 evolution-2.10.2.ebuild 6538
-EBUILD evolution-2.10.3.ebuild 6974 RMD160 9c20a315e4ca1937183d8464d2f121474d7fa482 SHA1 b9def568d761c838ce38789c88f19d62ccefb5dc SHA256 bbf9e4071b28446401a3d87b2d3622abc2792ce29bb0d19c6b19de1a70e2f8ac
-MD5 44f6b6eb0b69b3907069dd8dbc446398 evolution-2.10.3.ebuild 6974
-RMD160 9c20a315e4ca1937183d8464d2f121474d7fa482 evolution-2.10.3.ebuild 6974
-SHA256 bbf9e4071b28446401a3d87b2d3622abc2792ce29bb0d19c6b19de1a70e2f8ac evolution-2.10.3.ebuild 6974
-EBUILD evolution-2.8.3-r2.ebuild 6835 RMD160 c149b538c0e25bcf245822772a33d10e8fa62248 SHA1 54b2003707a4478a06fec854bfc95097f36ef8b5 SHA256 c3098024c9f24365da3b9eb4174a8484f28d53ad8bdced13dcbc578b57097356
-MD5 2e4c6519e987085db40744a73137fcb1 evolution-2.8.3-r2.ebuild 6835
-RMD160 c149b538c0e25bcf245822772a33d10e8fa62248 evolution-2.8.3-r2.ebuild 6835
-SHA256 c3098024c9f24365da3b9eb4174a8484f28d53ad8bdced13dcbc578b57097356 evolution-2.8.3-r2.ebuild 6835
-MISC ChangeLog 47108 RMD160 e0a530eddf7ea9c52a801f52c247c3c0ce74b7a6 SHA1 0b3ec5d67bd8bf580a86ced2ac3e82879a7ac1ac SHA256 d61e955fba7f56f2bfc937ab2c600e2e5e1ec4a8b526d000e3233757bb3cd8b1
-MD5 353967a580fb99b404bc812e8b679c3c ChangeLog 47108
-RMD160 e0a530eddf7ea9c52a801f52c247c3c0ce74b7a6 ChangeLog 47108
-SHA256 d61e955fba7f56f2bfc937ab2c600e2e5e1ec4a8b526d000e3233757bb3cd8b1 ChangeLog 47108
+EBUILD evolution-2.10.2.ebuild 6542 RMD160 7753543267f46c1dd86dfc1dde116d01a92e905c SHA1 ddda6d0fbf2b0bf77a651127aa72bad0826a5822 SHA256 42c4b86054b629f0522f93937b04b0b4a518c75567e25e17e8a848c5f3a845e5
+MD5 2711304b9f1ee76b9e2da86999f0898a evolution-2.10.2.ebuild 6542
+RMD160 7753543267f46c1dd86dfc1dde116d01a92e905c evolution-2.10.2.ebuild 6542
+SHA256 42c4b86054b629f0522f93937b04b0b4a518c75567e25e17e8a848c5f3a845e5 evolution-2.10.2.ebuild 6542
+EBUILD evolution-2.10.3.ebuild 6976 RMD160 81316448468ef3ee382ad1d2cc198724ff7e6f03 SHA1 c58bae8daf4f1dc09398f10f88a7b78f4c1984e1 SHA256 0229cdca50afee7fadf39a5a116c660671ad704742ee203c334155d479f10019
+MD5 e5a11424dab1f39074c2dbd7c5db9ec2 evolution-2.10.3.ebuild 6976
+RMD160 81316448468ef3ee382ad1d2cc198724ff7e6f03 evolution-2.10.3.ebuild 6976
+SHA256 0229cdca50afee7fadf39a5a116c660671ad704742ee203c334155d479f10019 evolution-2.10.3.ebuild 6976
+EBUILD evolution-2.12.0.ebuild 4690 RMD160 2dfd04ea187d8d9349856b7accfb35124f97437a SHA1 838487e7c2a6421442f5a5e98e0b5e06a283cf24 SHA256 0d118eb8924156c8b9a3c2e9fc33a57d35318fb02de19c6d618f26988df7f9c7
+MD5 393e9ce9e5f1acf069f74fbb8a98337d evolution-2.12.0.ebuild 4690
+RMD160 2dfd04ea187d8d9349856b7accfb35124f97437a evolution-2.12.0.ebuild 4690
+SHA256 0d118eb8924156c8b9a3c2e9fc33a57d35318fb02de19c6d618f26988df7f9c7 evolution-2.12.0.ebuild 4690
+EBUILD evolution-2.8.3-r2.ebuild 6832 RMD160 dba664223761a50a0d65c2f41ddb51633053a68e SHA1 33bb2845bb2c1d5cbdef6b193ded61f67eecee08 SHA256 a485e37af8bf3c5b75001ae2dc33983ae7cb9fd855214d7f7249910c97c4c970
+MD5 9510860d0d184ba331684ba64c172dad evolution-2.8.3-r2.ebuild 6832
+RMD160 dba664223761a50a0d65c2f41ddb51633053a68e evolution-2.8.3-r2.ebuild 6832
+SHA256 a485e37af8bf3c5b75001ae2dc33983ae7cb9fd855214d7f7249910c97c4c970 evolution-2.8.3-r2.ebuild 6832
+MISC ChangeLog 47516 RMD160 f4b4bdc9bc5c992417944b81dc94fe06df184b27 SHA1 2834eb54c956018befb7890a85bc3d2d4a987a37 SHA256 1fbecf7bf817c9379a0ddc8d9aa69b97c6de957b5a2575f5172f8c7d7fc1d52b
+MD5 34d5f601629e2400b7686cc206ec6e29 ChangeLog 47516
+RMD160 f4b4bdc9bc5c992417944b81dc94fe06df184b27 ChangeLog 47516
+SHA256 1fbecf7bf817c9379a0ddc8d9aa69b97c6de957b5a2575f5172f8c7d7fc1d52b ChangeLog 47516
 MISC metadata.xml 166 RMD160 77916dbe8cde7cbd9b894b2874da250319837fa9 SHA1 4033789b47b24264672f0c72b1298f5e29e99cf4 SHA256 e76aa203f78388331856db0a1b1a48fc056c21e19c579dbea9e1a89a4d132abe
 MD5 df8719c5946032d4644134e05f9afa40 metadata.xml 166
 RMD160 77916dbe8cde7cbd9b894b2874da250319837fa9 metadata.xml 166
@@ -80,6 +89,9 @@ SHA256 07f7a1a4a15d135af1f7b5f8b961850e3a450df32f414efb85a7c66104131753 files/di
 MD5 fbeda33651078871676f7154c451e318 files/digest-evolution-2.10.3 536
 RMD160 d95f7f3bc4b42a918daaa0a5237d6a39c250dbf2 files/digest-evolution-2.10.3 536
 SHA256 758ae690144da029d2b51fe932090b51686fe33131ba8bfed30c72f788ebabee files/digest-evolution-2.10.3 536
+MD5 6bf2e987612e1a3e36b275be76f9082f files/digest-evolution-2.12.0 259
+RMD160 4823c95d587d49d0dcda51884841c270ff865822 files/digest-evolution-2.12.0 259
+SHA256 87cdc062b5f6baeb1fe746e174892f5e3a977d0c399f708b4af121ce21a79099 files/digest-evolution-2.12.0 259
 MD5 4baf69f8a0985f0b493a39c1e5f2920e files/digest-evolution-2.8.3-r2 533
 RMD160 0aca45717cdcb1e57839b1826d465c3f96ebd8b5 files/digest-evolution-2.8.3-r2 533
 SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/digest-evolution-2.8.3-r2 533
diff --git a/mail-client/evolution/evolution-2.10.2.ebuild b/mail-client/evolution/evolution-2.10.2.ebuild
index 0fb8b44c34a7..55fe586dc191 100644
--- a/mail-client/evolution/evolution-2.10.2.ebuild
+++ b/mail-client/evolution/evolution-2.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.2.ebuild,v 1.11 2007/08/28 18:18:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.2.ebuild,v 1.12 2007/10/12 14:40:18 eva Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.9"
@@ -164,7 +164,7 @@ src_unpack() {
 	use bogofilter && epatch "${FILESDIR}"/${PN}-2.9.2-bf-junk.patch.gz
 
 	# certificate filtering for clueless users (and even for those who know)
-	epatch ${FILESDIR}/${PN}-2.8.2.1-certificate-manager-filtering.patch
+	epatch "${FILESDIR}"/${PN}-2.8.2.1-certificate-manager-filtering.patch
 
 	# Fix timezone offsets on fbsd.  bug #183708
 	epatch "${FILESDIR}"/${P}-fbsd.patch
@@ -176,7 +176,7 @@ src_compile() {
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
+			s|mozilla-nspr|nspr|" "${S}"/configure
 		G2CONF="${G2CONF} --enable-nss=yes"
 	else
 		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
diff --git a/mail-client/evolution/evolution-2.10.3.ebuild b/mail-client/evolution/evolution-2.10.3.ebuild
index cbd6c07b83c2..68f7ad76800a 100644
--- a/mail-client/evolution/evolution-2.10.3.ebuild
+++ b/mail-client/evolution/evolution-2.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.3.ebuild,v 1.7 2007/09/27 11:56:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.3.ebuild,v 1.8 2007/10/12 14:40:18 eva Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.9"
@@ -164,14 +164,14 @@ src_unpack() {
 	use bogofilter && epatch "${FILESDIR}"/${PN}-2.9.2-bf-junk.patch.gz
 
 	# certificate filtering for clueless users (and even for those who know)
-	epatch ${FILESDIR}/${PN}-2.8.2.1-certificate-manager-filtering.patch
+	epatch "${FILESDIR}"/${PN}-2.8.2.1-certificate-manager-filtering.patch
 
 	# Fix timezone offsets on fbsd.  bug #183708
 	epatch "${FILESDIR}"/${PN}-2.10.2-fbsd.patch
 
 	# Maildir account configured to select files and not directories bug 133504
 	# Requires DEPEND on >=e-d-s-1.10.2-r1.
-	epatch ${FILESDIR}/${PN}-2.10-fix-maildir-account.patch
+	epatch "${FILESDIR}"/${PN}-2.10-fix-maildir-account.patch
 
 	eautoreconf
 }
@@ -180,7 +180,7 @@ src_compile() {
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
+			s|mozilla-nspr|nspr|" "${S}"/configure
 		G2CONF="${G2CONF} --enable-nss=yes"
 	else
 		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
diff --git a/mail-client/evolution/evolution-2.12.0.ebuild b/mail-client/evolution/evolution-2.12.0.ebuild
new file mode 100644
index 000000000000..8889387a7b59
--- /dev/null
+++ b/mail-client/evolution/evolution-2.12.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.0.ebuild,v 1.1 2007/10/12 14:40:18 eva Exp $
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+# gstreamer for audio-inline, when it uses 0.10
+IUSE="crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
+
+# Pango dependency required to avoid font rendering problems
+RDEPEND="
+	>=x11-libs/gtk+-2.10
+	>=gnome-extra/evolution-data-server-1.11.90
+	>=x11-themes/gnome-icon-theme-1.2
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-extra/gtkhtml-3.16
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libgnomeui-2
+	>=dev-libs/libxml2-2
+	dbus? ( dev-libs/dbus-glib )
+	hal? ( >=sys-apps/hal-0.5.4 )
+	x11-libs/libnotify
+	pda? (
+		>=app-pda/gnome-pilot-2.0.15
+		>=app-pda/gnome-pilot-conduits-2 )
+	dev-libs/atk
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )
+	networkmanager? ( net-misc/networkmanager )
+	>=net-libs/libsoup-2.2.96
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	>=dev-libs/glib-2.10
+	>=gnome-base/orbit-2.9.8
+	spell? ( >=app-text/gnome-spell-1.0.5 )
+	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
+	ldap? ( >=net-nds/openldap-2 )
+	mono? ( >=dev-lang/mono-1 )"
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.10
+#		>=media-libs/gst-plugins-base-0.10 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/gnome-doc-utils-0.9.1
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+
+pkg_setup() {
+	G2CONF="--without-kde-applnk-path        \
+		--enable-plugins=experimental    \
+		$(use_enable ssl nss)            \
+		$(use_enable ssl smime)          \
+		$(use_enable ipv6)               \
+		$(use_enable mono)               \
+		$(use_enable nntp)               \
+		$(use_enable pda pilot-conduits) \
+		$(use_enable profile profiling)  \
+		$(use_with ldap openldap)        \
+		$(use_with kerberos krb5 /usr)"
+
+	# We need a graphical pinentry frontend to be able to ask for the GPG
+	# password from inside evolution, bug 160302
+	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT3 support"
+		fi
+	fi
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	fi
+
+	# dang - I've changed this to do --enable-plugins=experimental.  This will autodetect
+	# new-mail-notify and exchange, but that cannot be helped for the moment.
+	# They should be changed to depend on a --enable-<foo> like mono is.  This
+	# cleans up a ton of crap from this ebuild.
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Mail-remote doesn't build
+	epatch "${FILESDIR}"/${PN}-2.11.90-mail-remote-broken.patch
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		sed -i -e "s|mozilla-nss|nss|
+			s|mozilla-nspr|nspr|" "${S}"/configure
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+
+	# problems with -O3 on gcc-3.3.1
+	replace-flags -O3 -O2
+
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To change the default browser if you are not using GNOME, do:"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	elog ""
+	elog "Replace 'mozilla %s' with which ever browser you use."
+	elog ""
+	elog "Junk filters are now a run-time choice. You will get a choice of"
+	elog "bogofilter or spamassassin based on which you have installed"
+	elog ""
+	elog "You have to install one of these for the spam filtering to actually work"
+}
diff --git a/mail-client/evolution/evolution-2.8.3-r2.ebuild b/mail-client/evolution/evolution-2.8.3-r2.ebuild
index 0031f6c467a5..72e5498f34b1 100644
--- a/mail-client/evolution/evolution-2.8.3-r2.ebuild
+++ b/mail-client/evolution/evolution-2.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.3-r2.ebuild,v 1.9 2007/07/08 05:00:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.3-r2.ebuild,v 1.10 2007/10/12 14:40:18 eva Exp $
 
 inherit eutils flag-o-matic alternatives gnome2 autotools
 
@@ -187,7 +187,7 @@ src_compile() {
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" ${S}/configure
+			s|mozilla-nspr|nspr|" "${S}"/configure
 		G2CONF="${G2CONF} --enable-nss=yes"
 	else
 		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
diff --git a/mail-client/evolution/files/digest-evolution-2.12.0 b/mail-client/evolution/files/digest-evolution-2.12.0
new file mode 100644
index 000000000000..6f4ea3948ee5
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.12.0
@@ -0,0 +1,3 @@
+MD5 aaa378a63477b56de214ea9eaa7f8560 evolution-2.12.0.tar.bz2 25562079
+RMD160 238c92d0fef5478bc6a51312ab8c68b970e9db98 evolution-2.12.0.tar.bz2 25562079
+SHA256 f1b9fc4f02d297c797bf3953f0742f745efc2c0ebb893d126c0e3a9bac84fe56 evolution-2.12.0.tar.bz2 25562079
diff --git a/mail-client/evolution/files/evolution-2.11.90-mail-remote-broken.patch b/mail-client/evolution/files/evolution-2.11.90-mail-remote-broken.patch
new file mode 100644
index 000000000000..2549e0ebd1fa
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.11.90-mail-remote-broken.patch
@@ -0,0 +1,11 @@
+--- configure.old	2007-08-14 20:39:02.320171822 +0200
++++ configure	2007-08-14 20:38:06.813953026 +0200
+@@ -35748,7 +35748,7 @@
+ plugins_standard="$plugins_standard_always"
+ all_plugins_standard="$plugins_standard"
+ 
+-plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote save-attachments"
++plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting save-attachments"
+ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
+ all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
+