New version for GNOME 2.26. CalDAV support for VTODO and VJOURNAL. Drop libical fork and use system's copy. Mail DB reorganization for unreleased beagle/tracker. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

18 files changed, 161 insertions, 723 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 5a908442df2f..4080b092f8b7 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.230 2009/04/27 14:39:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.231 2009/05/23 22:11:41 eva Exp $
+
+*evolution-data-server-2.26.2 (23 May 2009)
+
+  23 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/evolution-data-server-1.11.3-as-needed.patch,
+  -files/evolution-data-server-1.12.1-icaltz-util.patch,
+  -evolution-data-server-1.12.3.ebuild,
+  -files/evolution-data-server-1.12.3-gtk-doc.patch,
+  -files/evolution-data-server-1.12.3-no-libsoup24.patch,
+  -files/evolution-data-server-2.21.4-as-needed.patch,
+  -files/evolution-data-server-2.21.4-gtkdoc-rebase.patch,
+  -files/evolution-data-server-2.21.90-icaltz-util.patch,
+  -evolution-data-server-2.22.3-r2.ebuild,
+  -files/evolution-data-server-2.22.3-CVE-2009-0547.patch,
+  -files/evolution-data-server-2.22.3-mail-cleanup-delay.patch,
+  -files/evolution-data-server-2.22.3-timezone-western.patch,
+  +files/evolution-data-server-2.25.5-as-needed.patch,
+  +files/evolution-data-server-2.25.90-no-libdb.patch,
+  +evolution-data-server-2.26.2.ebuild,
+  -files/evolution-data-server-no_lazy_bindings.patch:
+  New version for GNOME 2.26. CalDAV support for VTODO and VJOURNAL. Drop
+  libical fork and use system's copy. Mail DB reorganization for unreleased
+  beagle/tracker. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org>
   evolution-data-server-2.24.5-r2:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index d7e7ab12d785..dc2c279ba5a3 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,26 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
-AUX evolution-data-server-1.11.3-as-needed.patch 1942 RMD160 1db5815026e06a47c91295f4b502b94692dbe115 SHA1 0f94fb16e14ed685154cd0ad1211095431e179ca SHA256 95b1d4a23e801a36c7027080347e8fcb1ad90bc1d4040e9bdab8d00eb1f27986
 AUX evolution-data-server-1.11.3-no-libdb.patch 570 RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 SHA1 411f311317439bf20643491d2b7d1cbee99c561e SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905
-AUX evolution-data-server-1.12.1-icaltz-util.patch 839 RMD160 58b17c2bed830ccabf4682fada9e5bd22d3fae48 SHA1 cd9aa108ba32d38ecc46b1749ff378faff4dc870 SHA256 8d7c5c5abab727eecd5cff1980e9987bf0dcadf0324288775c347e0da4f81175
-AUX evolution-data-server-1.12.3-gtk-doc.patch 1329 RMD160 e8bd157481cc1ab404c0469e97de0b9428eaf3e5 SHA1 87e47d5eb454f5e8485f6ddaa9d1c6efd2866ed3 SHA256 8f4c16ae964f2e87a5f6ddccfca14bedcdec8ea56939d3233f5165abe6cd2165
-AUX evolution-data-server-1.12.3-no-libsoup24.patch 1238 RMD160 37506a113e7dc391b7cffb21b193ae1503cc2443 SHA1 0a4fdd6030cdb715d42c19342dcc0da5c6ebb20c SHA256 e69bf9d438a8acb48d72b4c31ff93d766a2ff29b20e010edf6645b6487d83f68
 AUX evolution-data-server-1.2.0-gentoo_etc_services.patch 815 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 SHA1 9248c74b334534f74e027fc119509673bff4542f SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a
 AUX evolution-data-server-1.8.0-camel-rewind.patch 499 RMD160 90b94f0b20a52a4fdf476bcfa5fe0ad2a064d488 SHA1 db7d42df20ab50d81835b9c1b9ebed84d1e0d8cb SHA256 1323e9dc957e3cc02fd1628fa21d448c8c985028e5b57d03596b6bde9ad66e0e
-AUX evolution-data-server-2.21.4-as-needed.patch 3339 RMD160 437d0a2ca704c12b0ef84d42bd30c5f309993192 SHA1 13527a0ab7486d95a21b1b60d8d8f23e65df1495 SHA256 9d64f94d8b2ccae4f3de0c1d8a35ae072357821829f17c83c012902542f47beb
-AUX evolution-data-server-2.21.4-gtkdoc-rebase.patch 739 RMD160 ed666a6e4118008bc69c96a1dfbfd4d879ecb597 SHA1 049a232cd8b664f949ef9834fd313c9e4b32998d SHA256 bbbd971fa4cba06c77fdd55874e4a29a4eb6afc02db7a2f1e5d4882eeae047b1
-AUX evolution-data-server-2.21.90-icaltz-util.patch 1343 RMD160 60db5a03375636b21eb968de35f032e915319277 SHA1 b3d7f3dd6dc32927265a410b82193972198143b0 SHA256 0279c058ad3f06e3703c4876decc644d6fbc18663f5f9c9e470cd31b1735b2a3
-AUX evolution-data-server-2.22.3-CVE-2009-0547.patch 4067 RMD160 8746855786cad2a6fbfda9e8dc84c63ce97f9ca2 SHA1 e6f1c2c0c6e62f90c6edf66aea4936f9eb7bd9c6 SHA256 85f7419bf507a5df8ef84d6f9453ad20664bb5ac540340d6f3a62242e2096c91
-AUX evolution-data-server-2.22.3-mail-cleanup-delay.patch 2974 RMD160 b482fbd815f1853522d845fa3acf643dbb5ebac8 SHA1 bae6f30319ea13d0b4c1aed63b92cf9f23f39c29 SHA256 3be97d843539c285a36af973145d3cc8bec99b84a54282eab0900df867b030c4
-AUX evolution-data-server-2.22.3-timezone-western.patch 2041 RMD160 8a0d9e308123ebc48a6ea9c7932c8639765a96b8 SHA1 963f7c7a0659a4ca6659f5983e8a47825c70b8e9 SHA256 56e3311334bac728db2c7afcd200e56acc3e0a9819659cdffb745c488bbb4126
 AUX evolution-data-server-2.23.6-as-needed.patch 3469 RMD160 43c48a35d0480a82db6cf131c0fdd0062353efc4 SHA1 96ef4dd901730ab2f77716646517a5ef40a5f982 SHA256 4899ffd8773229ecb43afbffdb91faa1fd433630395792998973f62aa54afb37
 AUX evolution-data-server-2.24.5-CVE-2009-0547.patch 3977 RMD160 24bd47ad13994f712bf4976fed06997e93130bf1 SHA1 624a3072eed233542829a557c1434a63ac9e64be SHA256 7aefaa4cf040efa4aca3fbf49910003a5368eb44d5e5b46f53f044495de7ff8d
+AUX evolution-data-server-2.25.5-as-needed.patch 3489 RMD160 3594d79fe2fb53fdb0a970d07821cea07a0e9b11 SHA1 35af25a7f156ec80924448cc6207f251ce876ef6 SHA256 5a8f35873fe5f9d11bccc3868351be3fbe27620d5546283db83c94a300631d6a
+AUX evolution-data-server-2.25.90-no-libdb.patch 355 RMD160 fcf879d6b7997f5731812bb76d05a05a777fbc56 SHA1 6ad4bff173c83c96573cf78ecd8131b2c08b76b0 SHA256 3b66f8d59c58bb2f3b5e8025892b9fabf6841cefe105e97e1070dda2d82d2088
 AUX evolution-data-server-CVE-2009-0582.patch 4651 RMD160 348f25abea3f513f170ca159923fc836ebafae42 SHA1 2d6b8ff93c43cf9e107de93c64be9df4d9b9a6d4 SHA256 b320f3efdbb19ddbf618be77cc4b52e5f422209b48273b5f62c7158b6efe618a
-AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403
-DIST evolution-data-server-1.12.3.tar.bz2 7447166 RMD160 c7102c38af4888f3f8933c9d28981d1809d504f8 SHA1 12b8b23fb77ff6436def3cc5ea472886c8e0350e SHA256 e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5
-DIST evolution-data-server-2.22.3.tar.bz2 7621470 RMD160 eed9c26fba0b69f0cbe44b01d698388c4ae44a0b SHA1 5d01b1248fcacef9c478787892f223338dff731b SHA256 6e9fa1258c8b4d1fd75a1da78ee637ad5b8a82bc58c93324d73afecf8d73fe87
 DIST evolution-data-server-2.24.5.tar.bz2 7857405 RMD160 d5f32f35a51e32885f96d4f92d7a0c6fae249a92 SHA1 b1df1f3580e3566d08faf2c093a685ee977d648c SHA256 c2240b96437f36f3656da538df7631510785664a6e7723cbf75ec0f88c3d38d1
-EBUILD evolution-data-server-1.12.3.ebuild 4995 RMD160 6ec189396d2dbb52642f2c44e6341994723d9b3e SHA1 200a94581c4960eaa40fa48b621e74e1c5ab1158 SHA256 1136317d3d7e75f7a9b3207e66bf491c35e698ea7e14c88b5a9ef5cdba4090c1
-EBUILD evolution-data-server-2.22.3-r2.ebuild 3318 RMD160 e258eedaf795fa69abe95c95251d1d9b3381a673 SHA1 9dd57d76e25362c003474c7d6ad5c8be493eb5aa SHA256 618f7eb08cd71aceea6dbfa8285f20bb495760563aa06dcfcf9ec1170f3606b4
+DIST evolution-data-server-2.26.2.tar.bz2 7257425 RMD160 c8ede51a8537dc9db96a796a0904f0fedcc25f37 SHA1 ca60a350259c6bc297cc0c324c5908a3d08ac4e3 SHA256 f09605100c3edba699818831ac6d8f6c94899416ba0959ded3a0292bbb79a22f
 EBUILD evolution-data-server-2.24.5-r2.ebuild 3644 RMD160 f2855d5980b83b1e8bf92e2659dd8edd344a6033 SHA1 0aa8435b6de24ea786802d1ef1033e7cb5db1d1a SHA256 ba3c8f1ddb5d56069e824d0f27a98e1b06b53d56d8e866dea50bc53e09072738
-MISC ChangeLog 42893 RMD160 f3a912436a597235881a14c79150820b42db0e64 SHA1 e2c6204e4226628bbcd27e9eed911299288b6349 SHA256 3151ef7ca6818867504a565bf759f43bc6f0c28e1135e7228245917da924021e
+EBUILD evolution-data-server-2.26.2.ebuild 3091 RMD160 29e449e7e1af4d51e3d1ec2e448ff75da6e525ca SHA1 03fd7a940e32d4c597284da0ac3a178c16b37e83 SHA256 bf207f018f418250d282794be092b65bbcef0b30d2e007ffd09e45c7e87ef0bc
+MISC ChangeLog 44053 RMD160 365c7d44797e5144e301f3da0d469e9636f44153 SHA1 2a6c6ba85f38bc009b983e66113c6b5f41e2af4b SHA256 510c4ed7dd760c16529a6ead92d027b2f1fddd716ee75dac3b8b52837f002a8a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoYdKMACgkQ1fmVwcYIWAb5lQCbBbJYYd66ZYMWCYCPLzfIbQ1t
+kVMAnjeOzr9lNQkdNFbfRia/EKf/Hqz+
+=M6fl
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild
deleted file mode 100644
index 1e3461481922..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.14 2009/03/16 22:48:38 eva Exp $
-EAPI="1"
-
-inherit db-use eutils flag-o-matic gnome2 autotools
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 Sleepycat"
-SLOT="0"
-KEYWORDS="arm"
-IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libbonobo-2.4.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-libs/libxml2-2
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	>=gnome-base/libgnomeui-2
-	>=net-libs/libsoup-2.2.91:2.2
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="$(use_with ldap openldap)       \
-		$(use_with kerberos krb5 /usr)      \
-		$(use_enable ssl nss)               \
-		$(use_enable ssl smime)             \
-		$(use_enable ipv6)                  \
-		$(use_enable gnome-keyring) \
-		--with-libdb=/usr/$(get_libdir)"
-
-	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
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix what ?
-	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
-
-	# Resolve symbols at execution time for setgid binaries
-	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Don't assume that endian.h and byteswap.h exist on all non sun os's
-	epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch
-
-	# Fix broken gtk-doc.make
-	epatch "${FILESDIR}"/${PN}-1.12.3-gtk-doc.patch
-
-	# Don't check for libsoup-2.4 - is not adapted to further API changes in 2.3 development
-	epatch "${FILESDIR}/${P}-no-libsoup24.patch"
-
-#-------------Upstream GNOME look here -----------------#
-
-	# --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.11.3-as-needed.patch
-
-	# fix for dep ordering so we can add libedataserverui to libexchange-storage
-	# we need to do this or: undefined reference to `e_passwords_get_password'
-	# are the kinds of errors you will get.
-
-	# move the groupwise backend and provider for addressbook, camel, and
-	# calendar to its own folder called server.deps.
-	mkdir server.deps || die "mkdir server.deps failed"
-	mv addressbook/backends/groupwise server.deps/addressbook || die "mv address/groupwise failed"
-	mv camel/providers/groupwise server.deps/camel || die "mv camel/groupwise failed"
-	mv calendar/backends/groupwise server.deps/calendar || die "mv calendar/groupwise failed"
-
-	# now fix the autotools foo for the new directory and the removed ones
-	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am || die "echo failed"
-
-	# remove groupwise folder from Makefile's since they are in a diff location
-	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am || die "sed 1 failed"
-
-	# fix configure.in location of the Makefile's
-	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in || die "sed 2 failed"
-	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in || die "sed 3 failed"
-	# tack on the server.deps Makefile on our last edit
-	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in || die "sed 4 failed"
-
-	# fix file includes
-	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c || die "sed 5 failed"
-
-	# Fix db version for FreeBSD users where -ldb is always db-1
-	sed -i -e "s:-ldb:-l$(db_libname):" configure.in || die "sed 6 failed"
-
-#---------------Upstream GNOME stop here---------------
-	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
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	cd "${S}"
-	gnome2_src_compile
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.22.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild
index 372909f1902d..2847d182bcb4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.22.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild
@@ -1,28 +1,32 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.22.3-r2.ebuild,v 1.8 2009/03/19 02:10:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild,v 1.1 2009/05/23 22:11:42 eva Exp $
 
-inherit db-use eutils flag-o-matic gnome2 autotools
+EAPI="2"
+
+inherit db-use eutils flag-o-matic gnome2 autotools versionator
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
 
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
 
-RDEPEND=">=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.10
+RDEPEND=">=dev-libs/glib-2.16.1
+	>=x11-libs/gtk+-2.14
 	>=gnome-base/orbit-2.9.8
-	>=gnome-base/gnome-vfs-2.4
 	>=gnome-base/libbonobo-2.20.3
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.4
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
+	>=dev-libs/libgweather-2.25.4
+	>=dev-libs/libical-0.43
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+	>=dev-db/sqlite-3.5
 	ssl? (
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
@@ -31,7 +35,7 @@ RDEPEND=">=dev-libs/glib-2.15.3
 	=sys-libs/db-4*
 	ldap? ( >=net-nds/openldap-2.0 )
 	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )"
+	krb4? ( virtual/krb5[krb4] )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
@@ -45,65 +49,39 @@ DOCS="ChangeLog MAINTAINERS NEWS TODO"
 pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_with ldap openldap)
+		$(use_with krb4 krb4 /usr)
 		$(use_with kerberos krb5 /usr)
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable ipv6)
 		$(use_enable gnome-keyring)
+		--with-weather
 		--with-libdb=/usr/$(get_libdir)"
-
-	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
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# Adjust to gentoo's /etc/service
 	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
 
 	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
+	epatch "${FILESDIR}"/${PN}-2.25.90-no-libdb.patch
 
 	# Rewind in camel-disco-diary to fix a crash
 	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
 
-	# Don't assume that endian.h and byteswap.h exist on all non sun os's
-	epatch "${FILESDIR}"/${PN}-2.21.90-icaltz-util.patch
-
-	# Don't error out if gtkdoc-rebase doesn't exist.
-	epatch "${FILESDIR}"/${PN}-2.21.4-gtkdoc-rebase.patch
-
-	# Fix building evo-exchange with --as-needed
-	epatch "${FILESDIR}"/${PN}-2.21.4-as-needed.patch
-
-	# Fix automatic mail delete after X days, upstream bug #514827
-	epatch "${FILESDIR}"/${P}-mail-cleanup-delay.patch
-
-	# Fix calculation of weekday, upstream bug #548268
-	epatch "${FILESDIR}"/${P}-timezone-western.patch
-
-	# Fix S/MIME verification.  Bug #258867
-	epatch "${FILESDIR}"/${P}-CVE-2009-0547.patch
+	# Fix building evo-exchange with --as-needed, upstream bug #342830
+	epatch "${FILESDIR}"/${PN}-2.25.5-as-needed.patch
 
 	# gtk-doc-am and gnome-common needed for this
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	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
+			s|mozilla-nspr|nspr|" "${S}"/configure || die "sed failed"
 		G2CONF="${G2CONF} --enable-nss=yes"
 	else
 		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
@@ -113,7 +91,25 @@ src_compile() {
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		MY_MAJORV=$(get_version_component_range 1-2)
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema || die "doins failed"
+		dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
 
-	cd "${S}"
-	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
 }
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
deleted file mode 100644
index fe287ea2377a..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/Makefile.am evolution-data-server-1.11.3/Makefile.am
---- evolution-data-server-1.11.3.orig/Makefile.am	2007-06-04 01:41:14.000000000 -0400
-+++ evolution-data-server-1.11.3/Makefile.am	2007-06-07 11:03:46.000000000 -0400
-@@ -9,8 +9,8 @@ if ENABLE_CALENDAR
- CALENDAR_DIR = calendar
- endif
- 
--SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
--DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
-+SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui servers server.deps src docs art po
-+DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
- 
- changelogs =			\
- 	ChangeLog
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am
---- evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am	2007-06-01 03:06:39.000000000 -0400
-+++ evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am	2007-06-07 11:02:23.000000000 -0400
-@@ -63,14 +63,15 @@ libexchange_storage_1_2_la_LIBADD =				\
- 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
- 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-+	$(top_builddir)/libedataserverui/libedataserverui-1.2.la\
- 	$(E_DATA_SERVER_LIBS)					\
- 	$(E_DATA_SERVER_UI_LIBS)				\
- 	$(LDAP_LIBS)						\
- 	$(SOUP_LIBS)						\
--	$(SOCKET_LIBS)
-+	$(SOCKET_LIBS)						\
-+	$(KRB5_LDFLAGS)
- 
- libexchange_storage_1_2_la_LDFLAGS =				\
--	$(KRB5_LDFLAGS)						\
- 	$(NO_UNDEFINED)						\
- 	-version-info $(LIBEXCHANGE_STORAGE_CURRENT):$(LIBEXCHANGE_STORAGE_REVISION):$(LIBEXCHANGE_STORAGE_AGE)
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch
deleted file mode 100644
index 982291b274aa..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur a/calendar/libical/src/libical/icaltz-util.c b/calendar/libical/src/libical/icaltz-util.c
---- a/calendar/libical/src/libical/icaltz-util.c	2007-10-12 07:31:10 +0100
-+++ b/calendar/libical/src/libical/icaltz-util.c	2007-10-19 11:34:38 +0100
-@@ -23,9 +23,11 @@
- #include <string.h>
- #if defined(sun) && defined(__SVR4)
- #include <sys/byteorder.h>
--#else
-+#elif defined(__linux__)
- #include <byteswap.h>
- #include <endian.h>
-+#else
-+#include <sys/endian.h>
- #endif
- #include <limits.h>
- #include <time.h>
-@@ -89,7 +91,11 @@
-     if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
-         return *(const int *) ptr;
-     else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
-+#ifdef __linux__
-         return bswap_32 (*(const int *) ptr);
-+#else
-+         return bswap32 (*(const uint32_t *) ptr);
-+#endif
- #endif
- 	else
- 	{
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch
deleted file mode 100644
index 62577ea90621..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gtk-doc.make	2008-01-20 13:50:03.000000000 +0100
-+++ gtk-doc.make	2007-10-14 19:45:39.000000000 +0200
-@@ -5,11 +5,11 @@
- ####################################
- 
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- else
--GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- endif
- 
- # We set GPATH here; this gives us semantics for GNU make
-@@ -139,8 +139,9 @@
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+	  if test `which gtkdoc-rebase` != ""; then \
-+        gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+	  fi \
- 	fi
- 	
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch
deleted file mode 100644
index 2f78ccdf7c73..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.in.orig	2008-03-26 02:45:26.000000000 +0200
-+++ configure.in	2008-03-26 02:46:03.000000000 +0200
-@@ -1407,14 +1407,8 @@
- AC_SUBST(E_FACTORY_LIBS)
- 
- dnl --- Groupwise flags
--PKG_CHECK_EXISTS(libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no)
--if test $have_libsoup_24 = yes; then
--    LIBSOUP_REQUIRED=2.3.0
--    LIBSOUP=libsoup-2.4
--else
--    LIBSOUP_REQUIRED=2.2.91
--    LIBSOUP=libsoup-2.2
--fi
-+LIBSOUP_REQUIRED=2.2.91
-+LIBSOUP=libsoup-2.2
- AC_SUBST(LIBSOUP_REQUIRED)
- AC_SUBST(LIBSOUP)
- EVO_SET_COMPILE_FLAGS(SOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)
---- configure.orig	2008-03-26 02:45:29.000000000 +0200
-+++ configure	2008-03-26 02:46:18.000000000 +0200
-@@ -31479,23 +31479,8 @@
- 
- 
- 
--if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  have_libsoup_24=yes
--else
--  have_libsoup_24=no
--fi
--if test $have_libsoup_24 = yes; then
--    LIBSOUP_REQUIRED=2.3.0
--    LIBSOUP=libsoup-2.4
--else
--    LIBSOUP_REQUIRED=2.2.91
--    LIBSOUP=libsoup-2.2
--fi
-+LIBSOUP_REQUIRED=2.2.91
-+LIBSOUP=libsoup-2.2
- 
- 
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-as-needed.patch
deleted file mode 100644
index a64d5675e581..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/addressbook/backends/Makefile.am evolution-data-server-2.21.4/addressbook/backends/Makefile.am
---- evolution-data-server-2.21.4.orig/addressbook/backends/Makefile.am	2007-10-23 05:57:41.000000000 -0400
-+++ evolution-data-server-2.21.4/addressbook/backends/Makefile.am	2007-12-17 13:25:00.000000000 -0500
-@@ -4,4 +4,4 @@ else
- LDAP_SUBDIR =
- endif
- 
--SUBDIRS = file vcf $(LDAP_SUBDIR) groupwise 
-+SUBDIRS = file vcf $(LDAP_SUBDIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/calendar/backends/Makefile.am evolution-data-server-2.21.4/calendar/backends/Makefile.am
---- evolution-data-server-2.21.4.orig/calendar/backends/Makefile.am	2007-10-24 02:39:45.000000000 -0400
-+++ evolution-data-server-2.21.4/calendar/backends/Makefile.am	2007-12-17 13:33:56.000000000 -0500
-@@ -1 +1 @@
--SUBDIRS = file groupwise http contacts weather caldav google
-+SUBDIRS = file http contacts weather caldav
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/camel/providers/Makefile.am evolution-data-server-2.21.4/camel/providers/Makefile.am
---- evolution-data-server-2.21.4.orig/camel/providers/Makefile.am	2007-10-23 05:57:04.000000000 -0400
-+++ evolution-data-server-2.21.4/camel/providers/Makefile.am	2007-12-17 13:24:50.000000000 -0500
-@@ -17,6 +17,6 @@ else
- SENDMAIL_DIR=sendmail
- endif
- 
--SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
-+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) hula
- 
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/Makefile.am evolution-data-server-2.21.4/Makefile.am
---- evolution-data-server-2.21.4.orig/Makefile.am	2007-10-23 05:59:44.000000000 -0400
-+++ evolution-data-server-2.21.4/Makefile.am	2007-12-17 13:33:44.000000000 -0500
-@@ -7,9 +7,12 @@ endif
- 
- if ENABLE_CALENDAR
- CALENDAR_DIR = calendar
-+CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google
- endif
- 
--SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-+LATER = camel/providers/groupwise addressbook/backends/groupwise $(CALENDAR_LATER)
-+
-+SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po
- DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
- 
- changelogs =			\
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.21.4/servers/exchange/storage/Makefile.am
---- evolution-data-server-2.21.4.orig/servers/exchange/storage/Makefile.am	2007-10-23 05:57:26.000000000 -0400
-+++ evolution-data-server-2.21.4/servers/exchange/storage/Makefile.am	2007-12-17 13:20:50.000000000 -0500
-@@ -63,6 +63,7 @@ libexchange_storage_1_2_la_LIBADD =				\
- 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
- 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-+	$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
- 	$(E_DATA_SERVER_LIBS)					\
- 	$(E_DATA_SERVER_UI_LIBS)				\
- 	$(LDAP_LIBS)						\
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-gtkdoc-rebase.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-gtkdoc-rebase.patch
deleted file mode 100644
index 963d5e2b0130..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-gtkdoc-rebase.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/gtk-doc.make evolution-data-server-2.21.4/gtk-doc.make
---- evolution-data-server-2.21.4.orig/gtk-doc.make	2007-12-16 22:56:57.000000000 -0500
-+++ evolution-data-server-2.21.4/gtk-doc.make	2007-12-17 10:51:40.000000000 -0500
-@@ -139,8 +139,7 @@ install-data-local:
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+	  gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
- 	fi
- 	
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.90-icaltz-util.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.90-icaltz-util.patch
deleted file mode 100644
index 0fbc8cb30b84..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.90-icaltz-util.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.90.orig/calendar/libical/src/libical/icaltz-util.c evolution-data-server-2.21.90/calendar/libical/src/libical/icaltz-util.c
---- evolution-data-server-2.21.90.orig/calendar/libical/src/libical/icaltz-util.c	2008-01-23 06:16:42.000000000 -0500
-+++ evolution-data-server-2.21.90/calendar/libical/src/libical/icaltz-util.c	2008-01-30 18:27:13.000000000 -0500
-@@ -23,16 +23,16 @@
- #include <string.h>
- #if defined(sun) && defined(__SVR4)
- #include <sys/byteorder.h>
--#else
--#ifdef _WIN32
-+#elif defined(_WIN32)
- #define BIG_ENDIAN 'B'
- #define LITTLE_ENDIAN 'l'
- #define BYTE_ORDER LITTLE_ENDIAN
- #define bswap_32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) <<  8) | (((val) & 0x00ff0000U) >>  8) | (((val) & 0xff000000U) >> 24))
--#else
-+#elif defined(__linux__)
- #include <byteswap.h>
- #include <endian.h>
--#endif
-+#else
-+#include <sys/endian.h>
- #endif
- #include <limits.h>
- #include <time.h>
-@@ -96,7 +96,11 @@ decode (const void *ptr)
-     if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
-         return *(const int *) ptr;
-     else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
-+#ifdef __linux__
-         return bswap_32 (*(const int *) ptr);
-+#else
-+         return bswap32 (*(const uint32_t *) ptr);
-+#endif
- #endif
- 	else
- 	{
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch
deleted file mode 100644
index 7ce27faf4723..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.22.3.orig/camel/camel-smime-context.c evolution-data-server-2.22.3/camel/camel-smime-context.c
---- evolution-data-server-2.22.3.orig/camel/camel-smime-context.c	2008-04-04 05:01:59.000000000 -0400
-+++ evolution-data-server-2.22.3/camel/camel-smime-context.c	2009-03-07 15:44:47.000000000 -0500
-@@ -40,6 +40,7 @@
- #include <smime.h>
- #include <pkcs11t.h>
- #include <pk11func.h>
-+#include <secoid.h>
- 
- #include <errno.h>
- 
-@@ -534,6 +535,7 @@ sm_verify_cmsg(CamelCipherContext *conte
- 	for (i = 0; i < count; i++) {
- 		NSSCMSContentInfo *cinfo = NSS_CMSMessage_ContentLevel(cmsg, i);
- 		SECOidTag typetag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-+		int which_digest;
- 
- 		switch (typetag) {
- 		case SEC_OID_PKCS7_SIGNED_DATA:
-@@ -543,45 +545,50 @@ sm_verify_cmsg(CamelCipherContext *conte
- 				goto fail;
- 			}
- 
--			/* need to build digests of the content */
--			if (!NSS_CMSSignedData_HasDigests(sigd)) {
--				if (extstream == NULL) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data"));
--					goto fail;
--				}
--
--				if ((poolp = PORT_NewArena(1024)) == NULL) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM));
--					goto fail;
--				}
--
--				digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd);
- 
--				digcx = NSS_CMSDigestContext_StartMultiple(digestalgs);
--				if (digcx == NULL) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
--					goto fail;
--				}
--
--				mem = (CamelStreamMem *)camel_stream_mem_new();
--				camel_stream_write_to_stream(extstream, (CamelStream *)mem);
--				NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len);
--				camel_object_unref(mem);
--
--				if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
--					goto fail;
--				}
--
--				if (NSS_CMSSignedData_SetDigests(sigd, digestalgs, digests) != SECSuccess) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
--					goto fail;
--				}
--
--				PORT_FreeArena(poolp, PR_FALSE);
--				poolp = NULL;
-+			if (extstream == NULL) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data"));
-+  				goto fail;
- 			}
--
-+  
-+			if ((poolp = PORT_NewArena(1024)) == NULL) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM));
-+				goto fail;
-+  			}
-+ 
-+			digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd);
-+			
-+			digcx = NSS_CMSDigestContext_StartMultiple(digestalgs);
-+			if (digcx == NULL) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-+				goto fail;
-+			}
-+  
-+			mem = (CamelStreamMem *)camel_stream_mem_new();
-+			camel_stream_write_to_stream(extstream, (CamelStream *)mem);
-+			NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len);
-+			camel_object_unref(mem);
-+  
-+			if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-+				goto fail;
-+			}
-+  
-+			for (which_digest = 0; digests[which_digest] != NULL; which_digest++) {
-+				SECOidData *digest_alg = SECOID_FindOID (&digestalgs[which_digest]->algorithm);
-+				if (digest_alg == NULL) {
-+					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
-+  					goto fail;
-+  				}
-+				if (NSS_CMSSignedData_SetDigestValue (sigd, digest_alg->offset, digests[which_digest]) != SECSuccess) {
-+					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
-+					goto fail;
-+  				}
-+  			}
-+  
-+			PORT_FreeArena(poolp, PR_FALSE);
-+			poolp = NULL;
-+			
- 			/* import all certificates present */
- 			if (NSS_CMSSignedData_ImportCerts(sigd, p->certdb, certUsageEmailSigner, PR_TRUE) != SECSuccess) {
- 				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Certificate import failed"));
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch
deleted file mode 100644
index 51030a14df37..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch
+++ /dev/null
@@ -1,98 +0,0 @@
----
-
-At http://bugzilla.gnome.org/show_bug.cgi?id=514827
-
-I have POP account in web.de
-I would like to leave in server only 1 days, and older messages should be
-deleted.
-I tried to do this with the pop account preference setting:
-x Leave messages on server
-x Delete messages older than 1 days
-
-However, the messages are still kept in the server although it is more than
-several days. 
-
-Index: b/camel/providers/pop3/camel-pop3-folder.c
-===================================================================
---- a/camel/providers/pop3/camel-pop3-folder.c	(revision 9476)
-+++ b/camel/providers/pop3/camel-pop3-folder.c	(working copy)
-@@ -356,6 +356,48 @@
- 	camel_pop3_store_expunge (pop3_store, ex);
- }
- 
-+static gboolean
-+pop3_get_message_time_from_cache (CamelFolder *folder, const char *uid, time_t *message_time)
-+{
-+	CamelPOP3Store *pop3_store;
-+	CamelStream *stream = NULL;
-+	char buffer[1];
-+	gboolean res = FALSE;
-+
-+	g_return_val_if_fail (folder != NULL, FALSE);
-+	g_return_val_if_fail (uid != NULL, FALSE);
-+	g_return_val_if_fail (message_time != NULL, FALSE);
-+
-+	pop3_store = CAMEL_POP3_STORE (folder->parent_store);
-+
-+	g_return_val_if_fail (pop3_store->cache != NULL, FALSE);
-+
-+	if ((stream = camel_data_cache_get (pop3_store->cache, "cache", uid, NULL)) != NULL
-+	    && camel_stream_read (stream, buffer, 1) == 1
-+	    && buffer[0] == '#') {
-+		CamelMimeMessage *message;
-+
-+		message = camel_mime_message_new ();
-+		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)message, stream) == -1) {
-+			g_warning (_("Cannot get message %s: %s"), uid, g_strerror (errno));
-+			camel_object_unref ((CamelObject *)message);
-+			message = NULL;
-+		}
-+
-+		if (message) {
-+			res = TRUE;
-+			*message_time = message->date + message->date_offset;
-+
-+			camel_object_unref ((CamelObject *)message);
-+		}
-+	}
-+
-+	if (stream) {
-+		camel_object_unref (stream);
-+	}
-+	return res;
-+}
-+
- int
- camel_pop3_delete_old(CamelFolder *folder, int days_to_delete,	CamelException *ex)
- {
-@@ -363,8 +405,7 @@
- 	CamelPOP3FolderInfo *fi;
- 	int i;
- 	CamelPOP3Store *pop3_store;
--	time_t temp;
--	CamelMessageInfo *minfo;
-+	time_t temp, message_time;
- 
- 	pop3_folder = CAMEL_POP3_FOLDER (folder);
- 	pop3_store = CAMEL_POP3_STORE (CAMEL_FOLDER(pop3_folder)->parent_store);
-@@ -374,10 +415,8 @@
- 	for (i = 0; i < pop3_folder->uids->len; i++) {
- 		fi = pop3_folder->uids->pdata[i];
- 
--		minfo = camel_folder_get_message_info (folder, fi->uid);
- 		d(printf("%s(%d): fi->uid=[%s]\n", __FILE__, __LINE__, fi->uid));
--		if(minfo) {
--			time_t message_time = ((CamelMessageInfoBase *)minfo)->date_received;
-+		if (pop3_get_message_time_from_cache (folder, fi->uid, &message_time)) {
- 			double time_diff = difftime(temp,message_time);
- 			int day_lag = time_diff/(60*60*24);
- 
-@@ -407,8 +446,6 @@
- 					camel_data_cache_remove(pop3_store->cache, "cache", fi->uid, NULL);
- 				}
- 			}
--			/* free message - not used anymore */
--			camel_folder_free_message_info (folder, minfo);
- 		}
- 	}
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch
deleted file mode 100644
index e1a4e6c2a12d..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch
+++ /dev/null
@@ -1,54 +0,0 @@
----
-At http://bugzilla.gnome.org/show_bug.cgi?id=548268
-
-As discussed in bug #528902, Evolution now uses time zone information extracted
-from the binary system time zone database.
-
-This conversion fails in at least in one case: Germany's (and therefore
-probably much of Western Europe) switch from summer saving time to normal time
-is exported in iCalendar events as [...]
-
-Index: b/calendar/libical/src/libical/icaltz-util.c
-===================================================================
---- a/calendar/libical/src/libical/icaltz-util.c	(revision 646)
-+++ b/calendar/libical/src/libical/icaltz-util.c	(working copy)
-@@ -198,6 +198,21 @@ icaltzutil_get_zone_directory (void)
- 	return zdir;
- }
- 
-+/* Calculate the relative position of the week in a month from a date */
-+static int
-+calculate_pos (icaltimetype icaltime)
-+{
-+	int pos;
-+
-+	pos = (icaltime.day -1) / 7;
-+
-+	/* Check if pos 3 is the last occurence of the week day in the month */	
-+	if (pos == 3 && ((icaltime.day + 7) > icaltime_days_in_month (icaltime.month, icaltime.year))) 
-+		pos = 4;
-+
-+	return r_pos [pos];
-+}
-+
- icalcomponent*
- icaltzutil_fetch_timezone (const char *location)
- {
-@@ -349,7 +364,7 @@ icaltzutil_fetch_timezone (const char *l
- 			icalrecurrencetype_clear (&ical_recur);
- 			ical_recur.freq = ICAL_YEARLY_RECURRENCE;
- 			ical_recur.by_month [0] = icaltime.month;
--			pos = r_pos [icaltime.day/7];
-+			pos = calculate_pos (icaltime);
- 			pos < 0 ? (sign = -1): (sign = 1);
- 			ical_recur.by_day [0] = sign * ((abs (pos) * 8) + icaltime_day_of_week (icaltime));
- 			icalprop = icalproperty_new_rrule (ical_recur);
-@@ -387,7 +402,7 @@ icaltzutil_fetch_timezone (const char *l
- 		icalrecurrencetype_clear (&ical_recur);
- 		ical_recur.freq = ICAL_YEARLY_RECURRENCE;
- 		ical_recur.by_month [0] = icaltime.month;
--		pos = r_pos [icaltime.day/7];
-+		pos = calculate_pos (icaltime);
- 		pos < 0 ? (sign = -1): (sign = 1);
- 		ical_recur.by_day [0] = sign * ((abs (pos) * 8) + icaltime_day_of_week (icaltime));
- 		icalprop = icalproperty_new_rrule (ical_recur);
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch
new file mode 100644
index 000000000000..c8c33b400ed6
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch
@@ -0,0 +1,54 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am evolution-data-server-2.23.6/addressbook/backends/Makefile.am
+--- evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am	2008-08-04 00:28:27.000000000 -0400
++++ evolution-data-server-2.23.6/addressbook/backends/Makefile.am	2008-08-05 12:26:15.000000000 -0400
+@@ -4,4 +4,4 @@ else
+ LDAP_SUBDIR =
+ endif
+ 
+-SUBDIRS = file vcf $(LDAP_SUBDIR) google groupwise webdav
++SUBDIRS = file vcf $(LDAP_SUBDIR)
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am evolution-data-server-2.23.6/calendar/backends/Makefile.am
+--- evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am	2008-04-11 07:10:31.000000000 -0400
++++ evolution-data-server-2.23.6/calendar/backends/Makefile.am	2008-08-05 12:25:51.000000000 -0400
+@@ -7 +7 @@
+-SUBDIRS = file groupwise http contacts $(WEATHER_SUBDIR) caldav google
++SUBDIRS = file http contacts $(WEATHER_SUBDIR) caldav
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/camel/providers/Makefile.am evolution-data-server-2.23.6/camel/providers/Makefile.am
+--- evolution-data-server-2.23.6.orig/camel/providers/Makefile.am	2008-08-01 02:34:59.000000000 -0400
++++ evolution-data-server-2.23.6/camel/providers/Makefile.am	2008-08-05 12:26:59.000000000 -0400
+@@ -21,6 +21,6 @@ else
+ SENDMAIL_DIR=sendmail
+ endif
+ 
+-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise $(HULA_DIR)
++SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) $(HULA_DIR)
+ 
+ 
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/Makefile.am evolution-data-server-2.23.6/Makefile.am
+--- evolution-data-server-2.23.6.orig/Makefile.am	2008-08-01 02:35:37.000000000 -0400
++++ evolution-data-server-2.23.6/Makefile.am	2008-08-05 12:28:22.000000000 -0400
+@@ -7,9 +7,12 @@ endif
+ 
+ if ENABLE_CALENDAR
+ CALENDAR_DIR = calendar
++CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google
+ endif
+ 
+-SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
++LATER = camel/providers/groupwise addressbook/backends/groupwise addressbook/backends/google addressbook/backends/webdav $(CALENDAR_LATER)
++
++SUBDIRS = $(LIBDB) win32 libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po
+ DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po	
+ changelogs =			\
+ 	ChangeLog
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am
+--- evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am	2008-04-11 07:10:16.000000000 -0400
++++ evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am	2008-08-05 12:25:51.000000000 -0400
+@@ -64,6 +64,7 @@ libexchange_storage_1_2_la_LIBADD =				\
+ 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
+ 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
++	$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
+ 	$(E_DATA_SERVER_LIBS)					\
+ 	$(E_DATA_SERVER_UI_LIBS)				\
+ 	$(LDAP_LIBS)						\
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch
new file mode 100644
index 000000000000..d201a56ac9b7
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch
@@ -0,0 +1,13 @@
+# We only support dynamic libdb
+--- a/configure.in	2007-06-04 06:50:47.000000000 -0400
++++ b/configure.in	2007-06-07 10:58:22.000000000 -0400
+@@ -1431,9 +1431,6 @@ export privdatadir
+ export privincludedir
+ export privdatadir
+
+-if test $dynamic_libdb = no; then
+-        AC_CONFIG_SUBDIRS(libdb/dist)
+-fi
+ AC_OUTPUT([
+ Makefile
+ evolution-data-server-zip
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
deleted file mode 100644
index a094433c8c93..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NurdB evolution-data-server-1.3.7/camel/Makefile.am evolution-data-server-1.3.7-patched/camel/Makefile.am
---- evolution-data-server-1.3.7/camel/Makefile.am	2005-07-08 11:57:02.000000000 -0500
-+++ evolution-data-server-1.3.7-patched/camel/Makefile.am	2005-08-17 15:40:24.000000000 -0500
-@@ -271,6 +271,8 @@
- 	camel-lock-helper.c 			\
- 	camel-lock-helper.h
- 
-+camel_lock_helper_1_2_LDFLAGS = -Wl,-z,now
-+
- # NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
- # because it might be setuid.
- camel_lock_helper_1_2_LDADD =			\
diff --git a/gnome-extra/evolution-webcal/Manifest b/gnome-extra/evolution-webcal/Manifest
index 38ffb6a2c2ca..5b9cfc11ce98 100644
--- a/gnome-extra/evolution-webcal/Manifest
+++ b/gnome-extra/evolution-webcal/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST evolution-webcal-2.21.92.tar.bz2 199394 RMD160 641acb467344730d6f572afe2005e9fce1d1c22b SHA1 c231b815d72df775bf05605c870f848b027aa3dc SHA256 c583707d338edf7957a2f92804901569c9f6c1b2d16ba3682b92ba96fa300dca
 DIST evolution-webcal-2.24.0.tar.bz2 153766 RMD160 35e8300eceb45b919e21671738383c24beee4a11 SHA1 0cd859d2d008e5b3c6cc8e83bb1c21f23e90a312 SHA256 370278680634f65717df9cef98f9a731eb93d58d303f322be51d7b38b1ff29a9
-EBUILD evolution-webcal-2.21.92.ebuild 758 RMD160 9483e4a6a1a4b10c898b6402eb625b42a5b7f079 SHA1 af518613b1c83a20d3f2c40c0fff1f82606f4025 SHA256 7cfce0e5ccf54595ba8cf82e7da53afd0365fa01a5adca1e1050e9d5ca3d7243
+DIST evolution-webcal-2.26.0.tar.bz2 155281 RMD160 4632a3f2cf2c345a1bc8d75fc82b5f229dd99c03 SHA1 0253df73d25c8933d1c1299e16f846110b9bf5da SHA256 d37e47aad820aa6f457bec42ea4b3c6f01fba85f3573204353c001dfed3d4bb6
+EBUILD evolution-webcal-2.21.92.ebuild 708 RMD160 6e8df1d0c1aba3e159e1486868ff9f551f93100b SHA1 0c9fce1f9ec2027a6476e9fe2734364667d114ee SHA256 a52aae24980595cc54f8e2cb1a935286a2417e6d5cfb7b1fa1659f2fc7b8c2fc
 EBUILD evolution-webcal-2.24.0.ebuild 760 RMD160 f2f63852396efdbc9f766274d857782259937dd7 SHA1 edfe747f0bb3d2ec6872e59e4af0855c19ce1a82 SHA256 72c21f95e8312b626245df1787c5c52ceac2c2d7db39c800c7b6925d9b34d10b
-MISC ChangeLog 12787 RMD160 6a89640c6ddda3e045105060e849b8bfe9e5ddc2 SHA1 b05d7eaaaca32184d5ebc8d66f894ebdece16fa2 SHA256 c0d4fb73baf2edc88620d8efffbec40e76c5bc736d0752dbf1dff5a648e4d50f
+EBUILD evolution-webcal-2.26.0.ebuild 740 RMD160 8831b705c83f862d14b312934a98d87dc3814efe SHA1 b7d020ba5b175fee108b2e365d3e5fb74b15f1d9 SHA256 6b34e95875ec4c2e3c9bfcaf09e01dccd00185222415458d55270e7559cdb51d
+MISC ChangeLog 12975 RMD160 973451314cdd41569106861898e50b976e6f52f2 SHA1 082f6063b7a1d636dbabfe764c12406ae1cf71ea SHA256 d3672066c225584b866f51092612c19a9594362955af319fc26b728f201eeb6d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoYdbwACgkQ1fmVwcYIWAaOogCgskOtkgJ0RG29ISXtbR0nNi4G
+U5AAnRUKvbdQswpV9a3XcCmEnC+i3Zy1
+=fp+9
+-----END PGP SIGNATURE-----