From e78754586970cb03701f3d9f1a92b6a98f3b37b6 Mon Sep 17 00:00:00 2001
From: Daniel Gryniewicz <dang@gentoo.org>
Date: Tue, 27 Mar 2007 16:02:45 +0000
Subject: [PATCH] gnome 2.18.0 Package-Manager: portage-2.1.2.2

---
 mail-client/evolution/ChangeLog               |  11 +-
 mail-client/evolution/Manifest                |  38 +++-
 mail-client/evolution/evolution-2.10.0.ebuild | 208 ++++++++++++++++++
 .../evolution/files/digest-evolution-2.10.0   |   6 +
 .../files/evolution-2.7.3-bf-junk.patch.gz    | Bin 10418 -> 0 bytes
 ....8.2.1-certificate-manager-filtering.patch |  82 +++++++
 .../files/evolution-2.9.2-bf-junk.patch.gz    | Bin 0 -> 10431 bytes
 .../files/evolution-2.9.91-cal-reply.patch    |  36 +++
 8 files changed, 369 insertions(+), 12 deletions(-)
 create mode 100644 mail-client/evolution/evolution-2.10.0.ebuild
 create mode 100644 mail-client/evolution/files/digest-evolution-2.10.0
 delete mode 100644 mail-client/evolution/files/evolution-2.7.3-bf-junk.patch.gz
 create mode 100644 mail-client/evolution/files/evolution-2.8.2.1-certificate-manager-filtering.patch
 create mode 100644 mail-client/evolution/files/evolution-2.9.2-bf-junk.patch.gz
 create mode 100644 mail-client/evolution/files/evolution-2.9.91-cal-reply.patch

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index b79c7fd077e0..0c1627266d9a 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # 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.166 2007/03/22 20:24:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.167 2007/03/27 16:02:45 dang Exp $
+
+*evolution-2.10.0 (27 Mar 2007)
+
+  27 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  -files/evolution-2.7.3-bf-junk.patch.gz,
+  +files/evolution-2.8.2.1-certificate-manager-filtering.patch,
+  +files/evolution-2.9.2-bf-junk.patch.gz,
+  +files/evolution-2.9.91-cal-reply.patch, +evolution-2.10.0.ebuild:
+  gnome 2.18.0
 
   22 Mar 2007; Zac Medico <zmedico@gentoo.org> evolution-2.8.3-r1.ebuild:
   Prefer >=app-crypt/gnupg-2.0.1-r2 over =app-crypt/gnupg-1.4* as a workaround
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 2fd9384c815c..0e6f62c91a75 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -13,10 +13,6 @@ AUX evolution-2.6.2-as-needed.patch 503 RMD160 11a3c2c6bee5b14e267747dccfa7aca4e
 MD5 d4f9b28fa25d52fd14a8144f22682ba9 files/evolution-2.6.2-as-needed.patch 503
 RMD160 11a3c2c6bee5b14e267747dccfa7aca4eaf14fdd files/evolution-2.6.2-as-needed.patch 503
 SHA256 b59fe688da890c40d5deef4c9ed791223d5dcba54a2a7286c0b588e5d974b49c files/evolution-2.6.2-as-needed.patch 503
-AUX evolution-2.7.3-bf-junk.patch.gz 10418 RMD160 8945624b19ac72b6047921b476ef968d4e9c2591 SHA1 66db9d34202c06c8fa0483bb1b321825ac245575 SHA256 a3aec31580402fb4113554acac684d12a083d22b80f273634d96e77364676dad
-MD5 74c3c80932b7e89b3b44ad3569c3cc49 files/evolution-2.7.3-bf-junk.patch.gz 10418
-RMD160 8945624b19ac72b6047921b476ef968d4e9c2591 files/evolution-2.7.3-bf-junk.patch.gz 10418
-SHA256 a3aec31580402fb4113554acac684d12a083d22b80f273634d96e77364676dad files/evolution-2.7.3-bf-junk.patch.gz 10418
 AUX evolution-2.8.0-uri.patch.gz 5564 RMD160 9e92e018adfec82ffdf572cc02ef638b4a62053d SHA1 6a52be2358153d0b18a1478b58f473654491839a SHA256 04401695c07ae85490151f65432becdcc23370a55e3c3add40c2618bd398a268
 MD5 a6083b552bc93e9224baecb1a4583941 files/evolution-2.8.0-uri.patch.gz 5564
 RMD160 9e92e018adfec82ffdf572cc02ef638b4a62053d files/evolution-2.8.0-uri.patch.gz 5564
@@ -29,6 +25,10 @@ AUX evolution-2.8.2.1-bf-junk.patch.gz 10431 RMD160 86f5a645ebbc69a757b6087e1718
 MD5 dbf53f4869faead04a951a25d974805e files/evolution-2.8.2.1-bf-junk.patch.gz 10431
 RMD160 86f5a645ebbc69a757b6087e17186f87d1953e4e files/evolution-2.8.2.1-bf-junk.patch.gz 10431
 SHA256 a6b21ef3f465c8b10e1c0b07402ec3f0697432b70eac08b369ffe31f80f3c981 files/evolution-2.8.2.1-bf-junk.patch.gz 10431
+AUX evolution-2.8.2.1-certificate-manager-filtering.patch 3040 RMD160 6e1bc22a4b83982e9405578b9a44223a9c364cfd SHA1 91211a275d79e26adf5510f45fedd3f0d569c945 SHA256 3b496e2ff6a6ba270e1f806b94ce8a910aaa5fbe14291c23a7856784d362e1fa
+MD5 23f69aad2b126a730a90295215baace3 files/evolution-2.8.2.1-certificate-manager-filtering.patch 3040
+RMD160 6e1bc22a4b83982e9405578b9a44223a9c364cfd files/evolution-2.8.2.1-certificate-manager-filtering.patch 3040
+SHA256 3b496e2ff6a6ba270e1f806b94ce8a910aaa5fbe14291c23a7856784d362e1fa files/evolution-2.8.2.1-certificate-manager-filtering.patch 3040
 AUX evolution-2.8.2.1-pilot-link-as-needed.patch 594 RMD160 621f459ae77f8a98dd5bb503b40a82595c71fe21 SHA1 af81da7f16b690fe634cc83a4b605b7453a3ff07 SHA256 fe54434610d0779328b2e8ad843342d347a6b1e0b0d077a1c19041dc63b08f57
 MD5 673ffa9d140881b086ec73c13d9abdc9 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594
 RMD160 621f459ae77f8a98dd5bb503b40a82595c71fe21 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594
@@ -41,10 +41,23 @@ AUX evolution-2.8.3-missing-groupwise-feature.patch 429 RMD160 2ca3bfa4bce41eb1e
 MD5 4431d899b1e6fff9d8ea9e3b23f33af7 files/evolution-2.8.3-missing-groupwise-feature.patch 429
 RMD160 2ca3bfa4bce41eb1e7fa4f298dfd000fe6f4cb6b files/evolution-2.8.3-missing-groupwise-feature.patch 429
 SHA256 88a4e262ef67d3465e4a06b11be2f23e7872b445f85a3c4e9ef41436b20182b4 files/evolution-2.8.3-missing-groupwise-feature.patch 429
+AUX evolution-2.9.2-bf-junk.patch.gz 10431 RMD160 26825a37ca603267293a8a063b3499f4c3535376 SHA1 974dbe1870d92cd4ad3d75b682f36a899bcff71b SHA256 f9de9826bd2acfaf79af15e7f41c73289693c1f77c6811f80bce1f6027de1493
+MD5 ca5ce673002b921efb90cc6df8c4872e files/evolution-2.9.2-bf-junk.patch.gz 10431
+RMD160 26825a37ca603267293a8a063b3499f4c3535376 files/evolution-2.9.2-bf-junk.patch.gz 10431
+SHA256 f9de9826bd2acfaf79af15e7f41c73289693c1f77c6811f80bce1f6027de1493 files/evolution-2.9.2-bf-junk.patch.gz 10431
+AUX evolution-2.9.91-cal-reply.patch 1679 RMD160 c8bc0e84a77b43a705ad00c7db5b93a1f1dcaabc SHA1 7ddc72ee4f6e55bbec91476713895ddd9c733c2f SHA256 5837a56bf1079f2e703d6cc5316425f583ae4975a977a2ec80684962f1be826f
+MD5 6d4ba6287ad008ef6c396d7d70efa36e files/evolution-2.9.91-cal-reply.patch 1679
+RMD160 c8bc0e84a77b43a705ad00c7db5b93a1f1dcaabc files/evolution-2.9.91-cal-reply.patch 1679
+SHA256 5837a56bf1079f2e703d6cc5316425f583ae4975a977a2ec80684962f1be826f files/evolution-2.9.91-cal-reply.patch 1679
+DIST evolution-2.10.0.tar.bz2 15525569 RMD160 ab12f69a0588d932399405982bd2561392f87aac SHA1 c1d42323250672c70655288eab83de70003b9470 SHA256 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7
 DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
 DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
 DIST evolution-2.8.2.1.tar.bz2 12921518 RMD160 9198236aded4c8b905eb990b725d01d399308491 SHA1 ccd38cddd96a0ed0375b315eb1e8dc536ef8bc90 SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144
 DIST evolution-2.8.3.tar.bz2 12931527 RMD160 cbf86ecbee7619f54ea6e60780d5c182208c5bf3 SHA1 afde414298d65ec344f52648c1915629bf7b79c3 SHA256 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90
+EBUILD evolution-2.10.0.ebuild 6604 RMD160 b58ae6840a59209b4aea47b0ae1559225c8464bf SHA1 d493c3c21e37da3885ad86a13c95e11c4a8a9889 SHA256 5677bb4a8be7f2858840d2e36dea1efaa0caf021aee6d0e9a0d53c6b05d72a32
+MD5 ddc89b424bcd53f862b023ab718d135b evolution-2.10.0.ebuild 6604
+RMD160 b58ae6840a59209b4aea47b0ae1559225c8464bf evolution-2.10.0.ebuild 6604
+SHA256 5677bb4a8be7f2858840d2e36dea1efaa0caf021aee6d0e9a0d53c6b05d72a32 evolution-2.10.0.ebuild 6604
 EBUILD evolution-2.6.2-r1.ebuild 6093 RMD160 80ba324287a41d60582fc9983d74d55ad9781ef0 SHA1 325ef903fe2670a8ba51e7b00899a534d01fc868 SHA256 2b82e23e800e9856955cb39b1f3fd91caae4def71b7e58aa11c4388b44cec9a3
 MD5 7ec60cee6b484082d89e292811a06d2b evolution-2.6.2-r1.ebuild 6093
 RMD160 80ba324287a41d60582fc9983d74d55ad9781ef0 evolution-2.6.2-r1.ebuild 6093
@@ -61,14 +74,17 @@ EBUILD evolution-2.8.3-r1.ebuild 6622 RMD160 26988b75fcd8264975701cad78bc69b8ddc
 MD5 f2a3101c8a4999257d8a994cb2c87f71 evolution-2.8.3-r1.ebuild 6622
 RMD160 26988b75fcd8264975701cad78bc69b8ddc6c4b3 evolution-2.8.3-r1.ebuild 6622
 SHA256 f7c1cc01084ef119d5bca42345c90943ff99826f92d7afa9a04a1dd0adcace4b evolution-2.8.3-r1.ebuild 6622
-MISC ChangeLog 41605 RMD160 70bbd72fc942c9f354c9ba06708c14182a92b5a2 SHA1 794fbc00454cb1c324fb4a8d89f8f7732bafb16d SHA256 c2c1da1a8ee19c9ef3829dd636911f343b5bb88944f02b028c49aec5252f4082
-MD5 2f6c379f9517300c626820c03d366844 ChangeLog 41605
-RMD160 70bbd72fc942c9f354c9ba06708c14182a92b5a2 ChangeLog 41605
-SHA256 c2c1da1a8ee19c9ef3829dd636911f343b5bb88944f02b028c49aec5252f4082 ChangeLog 41605
+MISC ChangeLog 41921 RMD160 8e4edd181149e400cac6670ee262057fac80bbf7 SHA1 9c60692bdeb8b223e10bc4f58507167be2084409 SHA256 51736c719e35ede435a016e6545c0598bd6751c454251613b036fd6b6f387398
+MD5 6c312ca16e0b5a1a57dc32a0a29cb670 ChangeLog 41921
+RMD160 8e4edd181149e400cac6670ee262057fac80bbf7 ChangeLog 41921
+SHA256 51736c719e35ede435a016e6545c0598bd6751c454251613b036fd6b6f387398 ChangeLog 41921
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
 SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a metadata.xml 228
+MD5 f8d4aba59d751576bb8b1210d5b9c0bd files/digest-evolution-2.10.0 536
+RMD160 20927d7c2ffb555e659935abb3a8da6e834c761e files/digest-evolution-2.10.0 536
+SHA256 055cde66f45f8cf2ca1958819b0d8550283dac9720747cb0d885c88b9c10deae files/digest-evolution-2.10.0 536
 MD5 f58ca96f6e0006d63acada5e98d62982 files/digest-evolution-2.6.2-r1 533
 RMD160 94fb86de744f42bcae39b6f5a0d6276ed559014e files/digest-evolution-2.6.2-r1 533
 SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/digest-evolution-2.6.2-r1 533
@@ -84,7 +100,7 @@ SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGAuX+/ejvha5XGaMRAqsUAKDfODvuBX+oc8vPzDKV7s069PU8eQCdHnV1
-oiV4nFxyvKHgx5izQFzfpD8=
-=3u10
+iD8DBQFGCT/EomPajV0RnrERAmMCAJoDEDJhyQC8TOUZNLIH8+g+Q+ZAaQCdFYve
++e9XvSrN0+UV++YZD+auGVU=
+=Sb0u
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.10.0.ebuild b/mail-client/evolution/evolution-2.10.0.ebuild
new file mode 100644
index 000000000000..942f67c6baf4
--- /dev/null
+++ b/mail-client/evolution/evolution-2.10.0.ebuild
@@ -0,0 +1,208 @@
+# 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.0.ebuild,v 1.1 2007/03/27 16:02:45 dang Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.9"
+inherit eutils flag-o-matic alternatives gnome2 autotools
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}
+	bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# gstreamer for audio-inline, when it uses 0.10
+IUSE="bogofilter 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-themes/gnome-icon-theme-1.2
+	dev-libs/atk
+	>=gnome-extra/gtkhtml-3.14.0
+	>=dev-libs/glib-2.10
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libbonobo-2
+	>=gnome-extra/evolution-data-server-1.9.4
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-base/gnome-vfs-2.4
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-libs/gtk+-2
+	>=gnome-base/libgnome-2
+	>=net-libs/libsoup-2.2.96
+	>=x11-libs/pango-1.8.1
+	x11-libs/libnotify
+	hal? ( >=sys-apps/hal-0.5.4 )
+	pda? (
+		>=app-pda/gnome-pilot-2
+		>=app-pda/gnome-pilot-conduits-2 )
+	spell? ( >=app-text/gnome-spell-1.0.5 )
+	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )
+	ldap? ( >=net-nds/openldap-2 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	dbus? ( || (
+		dev-libs/dbus-glib
+		~sys-apps/dbus-0.62 ) )
+	networkmanager? ( net-misc/networkmanager )
+	mono? ( >=dev-lang/mono-1 )
+	bogofilter? ( mail-filter/bogofilter )
+	!bogofilter? ( mail-filter/spamassassin )"
+#	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
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+
+pkg_setup() {
+	G2CONF="--disable-default-binary \
+		--without-kde-applnk-path        \
+		$(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
+
+	# Plug-ins to install. Normally we would want something similar to
+	# --enable-plugins=all (plugins_base + plugins_standard), except for some
+	# special cases.
+	local plugins="calendar-file calendar-http calendar-weather \
+		itip-formatter plugin-manager default-source addressbook-file \
+		startup-wizard print-message mark-all-read groupwise-features \
+		groupwise-account-setup hula-account-setup mail-account-disable \
+		publish-calendar caldav imap-features \
+		bbdb subject-thread save-calendar select-one-source copy-tool \
+		mail-to-task mark-calendar-offline mailing-list-actions \
+		new-mail-notify default-mailer import-ics-attachments"
+
+	# For dev releases, add experimental plugins
+	plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
+		prefer-plain save-attachments"
+
+	if use bogofilter; then
+		plugins="${plugins} bf-junk-plugin"
+	else
+		plugins="${plugins} sa-junk-plugin"
+	fi
+
+	# The special cases
+
+	# remove this due to bug #128035 re-enable later if it doesn't dep on
+	# gstreamer-0.8
+	# use gstreamer && plugins="${plugins} audio-inline"
+	use dbus && plugins="${plugins} new-mail-notify"
+	use mono && plugins="${plugins} mono"
+
+	if built_with_use gnome-extra/evolution-data-server ldap; then
+		plugins="${plugins} exchange-operations"
+	fi
+
+	local pluginlist=""
+	for p in $plugins; do
+		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
+		pluginlist="${pluginlist}${p}"
+	done
+
+	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Accept the list of plugins separated by commas instead of spaces.
+	epatch "${FILESDIR}"/${PN}-2.3.7-configure_plugins.patch
+
+	# Fix 64-bit warnings
+	epatch "${FILESDIR}"/${PN}-2.8.1.1-64-bit.patch
+
+	# Fix linking against pilot-link wiht --as-needed; bug #154453
+	epatch "${FILESDIR}"/${PN}-2.8.2.1-pilot-link-as-needed.patch
+
+	# Fix "reply to meeting" buffer overruns
+	epatch "${FILESDIR}"/${PN}-2.9.91-cal-reply.patch
+
+	# Add bogofilter junk plugin source
+	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
+
+	eautoreconf
+}
+
+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
+
+	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9][0-9]"
+	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."
+}
diff --git a/mail-client/evolution/files/digest-evolution-2.10.0 b/mail-client/evolution/files/digest-evolution-2.10.0
new file mode 100644
index 000000000000..87f223fb9d99
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.10.0
@@ -0,0 +1,6 @@
+MD5 68d32e518f235bea9d768ae55e91bffc evolution-2.10.0.tar.bz2 15525569
+RMD160 ab12f69a0588d932399405982bd2561392f87aac evolution-2.10.0.tar.bz2 15525569
+SHA256 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7 evolution-2.10.0.tar.bz2 15525569
+MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
diff --git a/mail-client/evolution/files/evolution-2.7.3-bf-junk.patch.gz b/mail-client/evolution/files/evolution-2.7.3-bf-junk.patch.gz
deleted file mode 100644
index 9a6337c14bbbcfb72c0653462d7e14778b415789..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10418
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

diff --git a/mail-client/evolution/files/evolution-2.8.2.1-certificate-manager-filtering.patch b/mail-client/evolution/files/evolution-2.8.2.1-certificate-manager-filtering.patch
new file mode 100644
index 000000000000..50926561d657
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.8.2.1-certificate-manager-filtering.patch
@@ -0,0 +1,82 @@
+Index: smime/gui/certificate-manager.c
+===================================================================
+--- smime/gui/certificate-manager.c	(révision 33213)
++++ smime/gui/certificate-manager.c	(copie de travail)
+@@ -133,6 +133,8 @@
+ 	const char *filename;
+ 
+ #ifdef USE_GTKFILECHOOSER
++	GtkFileFilter* filter;
++
+ 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
+ 					       NULL,
+ 					       GTK_FILE_CHOOSER_ACTION_OPEN,
+@@ -140,6 +142,16 @@
+ 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ 					       NULL);
+ 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
++
++	filter = gtk_file_filter_new();
++	gtk_file_filter_set_name (filter, _("All PKCS12 files"));
++	gtk_file_filter_add_mime_type (filter, "application/x-pkcs12");
++	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
++
++	filter = gtk_file_filter_new ();
++	gtk_file_filter_set_name (filter, _("All files"));
++	gtk_file_filter_add_pattern (filter, "*");
++	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
+ #else
+ 	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
+ #endif
+@@ -372,6 +384,8 @@
+ 	const char *filename;
+ 
+ #ifdef USE_GTKFILECHOOSER
++	GtkFileFilter *filter;
++
+ 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
+ 					       NULL,
+ 					       GTK_FILE_CHOOSER_ACTION_OPEN,
+@@ -379,6 +393,16 @@
+ 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ 					       NULL);
+ 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
++
++	filter = gtk_file_filter_new();
++	gtk_file_filter_set_name (filter, _("All email certificate files"));
++	gtk_file_filter_add_mime_type (filter, "application/x-x509-email-cert");
++	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
++
++	filter = gtk_file_filter_new ();
++	gtk_file_filter_set_name (filter, _("All files"));
++	gtk_file_filter_add_pattern (filter, "*");
++	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
+ #else
+ 	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
+ #endif
+@@ -592,6 +616,8 @@
+ 	const char *filename;
+ 
+ #ifdef USE_GTKFILECHOOSER
++	GtkFileFilter *filter;
++
+ 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
+ 					       NULL,
+ 					       GTK_FILE_CHOOSER_ACTION_OPEN,
+@@ -599,6 +625,16 @@
+ 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ 					       NULL);
+ 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
++
++	filter = gtk_file_filter_new();
++	gtk_file_filter_set_name (filter, _("All CA certificate files"));
++	gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert");
++	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
++
++	filter = gtk_file_filter_new ();
++	gtk_file_filter_set_name (filter, _("All files"));
++	gtk_file_filter_add_pattern (filter, "*");
++	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
+ #else
+ 	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
+ #endif
diff --git a/mail-client/evolution/files/evolution-2.9.2-bf-junk.patch.gz b/mail-client/evolution/files/evolution-2.9.2-bf-junk.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0e4057bd61ff24ebb644a26bd8decbf7ca1d28db
GIT binary patch
literal 10431
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

literal 0
HcmV?d00001

diff --git a/mail-client/evolution/files/evolution-2.9.91-cal-reply.patch b/mail-client/evolution/files/evolution-2.9.91-cal-reply.patch
new file mode 100644
index 000000000000..5a62a853a433
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.9.91-cal-reply.patch
@@ -0,0 +1,36 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-2.9.91.orig/calendar/gui/itip-utils.c evolution-2.9.91/calendar/gui/itip-utils.c
+--- evolution-2.9.91.orig/calendar/gui/itip-utils.c	2007-01-08 09:50:33.000000000 -0500
++++ evolution-2.9.91/calendar/gui/itip-utils.c	2007-02-15 17:37:12.000000000 -0500
+@@ -1476,28 +1476,28 @@ reply_to_calendar_comp (ECalComponentIti
+ 		body = "<br><br><hr><br><b>______ Original Appointment ______ </b><br><br><table>";
+ 
+ 		if (orig_from && *orig_from){
+-			char *part1 = (char *) malloc (sizeof (char) * 200);
++			char *part1 = (char *) malloc (50 + strlen (orig_from));
+ 			sprintf (part1, "<tr><td><b>From</b></td><td>:</td><td>%s</td></tr>", orig_from);
+ 			body = g_strconcat (body, (gchar *)part1, NULL);
+ 			g_free (part1);
+ 		}
+ 
+ 		if (subject){
+-			char *part2 = (char *) malloc (sizeof (char) * 100);
++			char *part2 = (char *) malloc (53 + strlen (subject));
+ 			sprintf (part2, "<tr><td><b>Subject</b></td><td>:</td><td>%s</td></tr>", subject);
+ 			body = g_strconcat (body, (gchar *)part2, NULL);
+ 			g_free (part2);
+ 		}
+ 			
+ 		{
+-			char *part3 = (char *) malloc (sizeof (char) * 100);
++			char *part3 = (char *) malloc (54 + strlen (location));
+ 			sprintf (part3, "<tr><td><b>Location</b></td><td>:</td><td>%s</td></tr>", location);
+ 			body = g_strconcat (body, (gchar *)part3, NULL);
+ 			g_free (part3);
+ 		}
+ 
+ 		if (time){
+-			char *part4 = (char *) malloc (sizeof (char) * 100);
++			char *part4 = (char *) malloc (64 + strlen (time));
+ 			sprintf (part4, "<tr><td><b>Time</b></td><td>:</td><td>%s</td></tr></table><br>", time);
+ 			body = g_strconcat (body, (gchar *)part4, NULL);
+ 			g_free (part4);
-- 
2.26.2