Fixed bug #133504 (maildir account file-chooser descended into directories), reported by Lindsay Haisley <fmouse-gentoo AT fmp.com>, and bug #175516 (contacts displays \n) reported by roger <roger AT eskimo.com>.

Package-Manager: portage-2.1.3.7

6 files changed, 317 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 10108ceb0962..301df4fc5c7c 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.142 2007/08/28 18:10:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.143 2007/08/31 08:55:19 pva Exp $
+
+*evolution-data-server-1.10.2-r1 (31 Aug 2007)
+
+  31 Aug 2007; <pva@gentoo.org>
+  +files/evolution-data-server-1.10-fix-maildir-account.patch,
+  +files/evolution-data-server-1.10-newline-in-contacts.patch,
+  +evolution-data-server-1.10.2-r1.ebuild:
+  Fixed bug #133504 (maildir account file-chooser descended into directories),
+  reported by Lindsay Haisley <fmouse-gentoo AT fmp.com>, and bug #175516
+  (contacts displays \n) reported by roger <roger AT eskimo.com>.
 
   28 Aug 2007; Jeroen Roovers <jer@gentoo.org>
   evolution-data-server-1.10.2.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 24ed5e3789ed..10eaf5dc71a1 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,11 @@
+AUX evolution-data-server-1.10-fix-maildir-account.patch 5436 RMD160 abc9da362f59793e5eedecee65c049ed7b5f3b04 SHA1 51aacf392594f80d0e50d012a265d281dafb8821 SHA256 45560ce1c0565103e07a9b8402139a9af945813ae19533a63027ff129cb9913f
+MD5 a3d26c871abd48ce5d0d292ef165102d files/evolution-data-server-1.10-fix-maildir-account.patch 5436
+RMD160 abc9da362f59793e5eedecee65c049ed7b5f3b04 files/evolution-data-server-1.10-fix-maildir-account.patch 5436
+SHA256 45560ce1c0565103e07a9b8402139a9af945813ae19533a63027ff129cb9913f files/evolution-data-server-1.10-fix-maildir-account.patch 5436
+AUX evolution-data-server-1.10-newline-in-contacts.patch 808 RMD160 df6f884c038e31cd908f3f29a6773ac32353bc4e SHA1 1e4f2a7323384aa34f22ec3c39911319c5a21aaa SHA256 3a0e9bc27d20357300416a4cb46f3fc772449bb95e118789c29f3e2dc8432b53
+MD5 a8db531fed89c9e6cc5be95f42794742 files/evolution-data-server-1.10-newline-in-contacts.patch 808
+RMD160 df6f884c038e31cd908f3f29a6773ac32353bc4e files/evolution-data-server-1.10-newline-in-contacts.patch 808
+SHA256 3a0e9bc27d20357300416a4cb46f3fc772449bb95e118789c29f3e2dc8432b53 files/evolution-data-server-1.10-newline-in-contacts.patch 808
 AUX evolution-data-server-1.10.1-imap-overflow.patch 1075 RMD160 6a821a9b430b77a989bc17ef95e48f8f2b566223 SHA1 23cbaf6b19c69c3599c257068a728e59472bc96e SHA256 4f0589d492185991ad46c1c4f48b60c23cc5d3b7616da8c8fb0b05d9ab1d464f
 MD5 fb05cd9c78028f5155ac111d9d7da403 files/evolution-data-server-1.10.1-imap-overflow.patch 1075
 RMD160 6a821a9b430b77a989bc17ef95e48f8f2b566223 files/evolution-data-server-1.10.1-imap-overflow.patch 1075
@@ -49,6 +57,10 @@ SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 files/ev
 DIST evolution-data-server-1.10.2.tar.bz2 7122238 RMD160 1fc5915338427a306e46a1c37bfc913fa05936a3 SHA1 0364dbf18306f9f36cdae37703f47571cb2a93fe SHA256 dc9772f92818c1846127df32524caaa4c266460af5bbd0e2254d0dba4fa36432
 DIST evolution-data-server-1.6.2.tar.bz2 7179353 RMD160 59af916ab4a9fabc14c65c16189188f829459985 SHA1 b9bcea4fbcdd0a39cb23e7cd1bc53a59c474a74d SHA256 3b02b940aaa90034609b9401d3da586e5439363ade9bf8d7fc562acacd28bfde
 DIST evolution-data-server-1.8.3.tar.bz2 7024111 RMD160 8051f35a0db514f919bf730cd35c37ea75029061 SHA1 f822fe520d778d0cd8efe8d6a767a5c0b483e798 SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc
+EBUILD evolution-data-server-1.10.2-r1.ebuild 4667 RMD160 41e12cd5bb235e20680226e677116b249d143f66 SHA1 14596fae52b646877a475931069cb5366e32834e SHA256 a2e29b788e71b8bb77947d5c791ad7bf4b214957e03bd21d09f5413f290eb296
+MD5 5179006192274130451bfc097bbefdc1 evolution-data-server-1.10.2-r1.ebuild 4667
+RMD160 41e12cd5bb235e20680226e677116b249d143f66 evolution-data-server-1.10.2-r1.ebuild 4667
+SHA256 a2e29b788e71b8bb77947d5c791ad7bf4b214957e03bd21d09f5413f290eb296 evolution-data-server-1.10.2-r1.ebuild 4667
 EBUILD evolution-data-server-1.10.2.ebuild 4404 RMD160 e2d97cd57d55617a0f2dd8c92cef0eb894524c80 SHA1 ec161ba5d40355bc0581c1f81c71356ee364de1c SHA256 f48c53f46929e2a92c89b088631633b576fe0cb576a9926ca0f68dfdaef5be56
 MD5 c23f31f26485e0bab06a21c023748cf0 evolution-data-server-1.10.2.ebuild 4404
 RMD160 e2d97cd57d55617a0f2dd8c92cef0eb894524c80 evolution-data-server-1.10.2.ebuild 4404
@@ -61,10 +73,10 @@ EBUILD evolution-data-server-1.8.3-r5.ebuild 5129 RMD160 1f01c1bddbdb4e9f02be60c
 MD5 7f25fef1eb7c6a25b8b0531d7a7c8529 evolution-data-server-1.8.3-r5.ebuild 5129
 RMD160 1f01c1bddbdb4e9f02be60cb423c924b4e30df39 evolution-data-server-1.8.3-r5.ebuild 5129
 SHA256 a9d65ada66829503a40c356275ca7180af817323dfeaf4edc21fe92062ac2b91 evolution-data-server-1.8.3-r5.ebuild 5129
-MISC ChangeLog 22611 RMD160 baf94f3e4b8f3dd43f96c88475ad7a4fe391a98d SHA1 3ff32511c09cf39852c27a4148422e0527746a7f SHA256 632d8c51e7e428700b5f7c6371f6f5097707db886130572c77fec978bcb902fc
-MD5 e60e7615593c184e91613309aa2db932 ChangeLog 22611
-RMD160 baf94f3e4b8f3dd43f96c88475ad7a4fe391a98d ChangeLog 22611
-SHA256 632d8c51e7e428700b5f7c6371f6f5097707db886130572c77fec978bcb902fc ChangeLog 22611
+MISC ChangeLog 23080 RMD160 febfb88dee9b4b4e758025b57c8c46f98eaa271e SHA1 fe26a0eda9d5a9f13b1fe197d05ded41c1510397 SHA256 2d35a6e1209d66fc895d0386de9359c96203235db122c31b66532a29303e523e
+MD5 b4e49cd7e576e58c254389fad39326c9 ChangeLog 23080
+RMD160 febfb88dee9b4b4e758025b57c8c46f98eaa271e ChangeLog 23080
+SHA256 2d35a6e1209d66fc895d0386de9359c96203235db122c31b66532a29303e523e ChangeLog 23080
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -72,6 +84,9 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 11300ebf1f4999399cc1536ceccc0d93 files/digest-evolution-data-server-1.10.2 292
 RMD160 8d19d9853ab4a56fbb50386a791771438b6c3378 files/digest-evolution-data-server-1.10.2 292
 SHA256 db08d3da5e01a2208cda82e2b8b13f91ab2d1319f96c9dca852b7be284611514 files/digest-evolution-data-server-1.10.2 292
+MD5 11300ebf1f4999399cc1536ceccc0d93 files/digest-evolution-data-server-1.10.2-r1 292
+RMD160 8d19d9853ab4a56fbb50386a791771438b6c3378 files/digest-evolution-data-server-1.10.2-r1 292
+SHA256 db08d3da5e01a2208cda82e2b8b13f91ab2d1319f96c9dca852b7be284611514 files/digest-evolution-data-server-1.10.2-r1 292
 MD5 7fd74c11700c9860da2318b520a983f8 files/digest-evolution-data-server-1.6.2-r1 289
 RMD160 4d8c1fc955f215beddbbc5b95ac3a0c81f8912fa files/digest-evolution-data-server-1.6.2-r1 289
 SHA256 c474de3fb11f9641e62deea95bc409b7d208389cf6deca8c15c08a39a0c70d14 files/digest-evolution-data-server-1.6.2-r1 289
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.10.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..563cf4b12afe
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.10.2-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2007 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.10.2-r1.ebuild,v 1.1 2007/08/31 08:55:19 pva Exp $
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+
+RDEPEND=">=dev-libs/glib-2.10
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gnome-common-2
+	keyring? ( gnome-base/gnome-keyring )
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=net-libs/libsoup-2.2.90
+	sys-libs/zlib
+	=sys-libs/db-4*
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	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 keyring 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.7.3-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
+
+	# Maildir account configured to select files and not directories bug 133504
+	epatch "${FILESDIR}"/${PN}-1.10-fix-maildir-account.patch
+
+	# evolution displays \n newline in Contacts bug 175516
+	epatch "${FILESDIR}"/${PN}-1.10-newline-in-contacts.patch
+
+#-------------Upstream GNOME look here -----------------#
+
+	# --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.9.91-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
+	mv addressbook/backends/groupwise server.deps/addressbook
+	mv camel/providers/groupwise server.deps/camel
+	mv calendar/backends/groupwise server.deps/calendar
+
+	# now fix the autotools foo for the new directory and the removed ones
+	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
+
+	# 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
+
+	# fix configure.in location of the Makefile's
+	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
+	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
+	# 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
+
+	# 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
+
+	# Fix db version for FreeBSD users where -ldb is always db-1
+	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
+
+#---------------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/files/digest-evolution-data-server-1.10.2-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.2-r1
new file mode 100644
index 000000000000..aad1499927d0
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.2-r1
@@ -0,0 +1,3 @@
+MD5 790dfc97a917dff8384dcb7cad42f87f evolution-data-server-1.10.2.tar.bz2 7122238
+RMD160 1fc5915338427a306e46a1c37bfc913fa05936a3 evolution-data-server-1.10.2.tar.bz2 7122238
+SHA256 dc9772f92818c1846127df32524caaa4c266460af5bbd0e2254d0dba4fa36432 evolution-data-server-1.10.2.tar.bz2 7122238
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-fix-maildir-account.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-fix-maildir-account.patch
new file mode 100644
index 000000000000..6fe9ef9cdc01
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-fix-maildir-account.patch
@@ -0,0 +1,116 @@
+ http://bugs.gentoo.org/show_bug.cgi?id=133504
+
+ 2007-08-13  Milan Crha  <mcrha@redhat.com>
+
+ ** Fix for bug http://bugzilla.gnome.org/show_bug.cgi?id=352346
+
+ * camel-provider.h: Added new constants CAMEL_URL_PART_PATH_DIR and
+ CAMEL_URL_NEED_PATH_DIR; when CAMEL_URL_NEED_PATH_DIR is set, then
+ in editor dialog is choosing file, without it directory.
+
+diff -Naur evolution-data-server-1.10.2.orig/camel/camel-provider.h evolution-data-server-1.10.2/camel/camel-provider.h
+--- evolution-data-server-1.10.2.orig/camel/camel-provider.h	2007-04-09 16:42:48.000000000 +0400
++++ evolution-data-server-1.10.2/camel/camel-provider.h	2007-08-13 13:00:24.000000000 +0400
+@@ -85,6 +85,7 @@
+ #define CAMEL_URL_PART_HOST	 (1 << 3)
+ #define CAMEL_URL_PART_PORT	 (1 << 4)
+ #define CAMEL_URL_PART_PATH	 (1 << 5)
++#define CAMEL_URL_PART_PATH_DIR  (1 << 6)
+ 
+ #define CAMEL_URL_PART_NEED	       8
+ #define CAMEL_URL_PART_HIDDEN	(CAMEL_URL_PART_NEED + 8)
+@@ -108,6 +109,7 @@
+ #define CAMEL_URL_NEED_HOST	 (CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED)
+ #define CAMEL_URL_NEED_PORT	 (CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED)
+ #define CAMEL_URL_NEED_PATH	 (CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED)
++#define CAMEL_URL_NEED_PATH_DIR  (CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED)
+ 
+ #define CAMEL_URL_HIDDEN_USER	 (CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN)
+ #define CAMEL_URL_HIDDEN_AUTH	 (CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN)
+diff -Naur evolution-data-server-1.10.2.orig/camel/providers/local/camel-local-provider.c evolution-data-server-1.10.2/camel/providers/local/camel-local-provider.c
+--- evolution-data-server-1.10.2.orig/camel/providers/local/camel-local-provider.c	2007-04-09 16:42:41.000000000 +0400
++++ evolution-data-server-1.10.2/camel/providers/local/camel-local-provider.c	2007-08-13 13:01:06.000000000 +0400
+@@ -55,7 +55,7 @@
+ 	N_("For storing local mail in MH-like mail directories."),
+ 	"mail",
+ 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
+-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
++	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
+ 	mh_conf_entries,
+ 	/* ... */
+ };
+@@ -73,7 +73,7 @@
+ 	N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."),
+ 	"mail",
+ 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
+-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
++	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
+ 	mbox_conf_entries,
+ 	/* ... */
+ };
+@@ -95,7 +95,7 @@
+ 	N_("For storing local mail in maildir directories."),
+ 	"mail",
+ 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
+-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
++	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
+ 	maildir_conf_entries,
+ 	/* ... */
+ };
+@@ -109,9 +109,9 @@
+ 	{ CAMEL_PROVIDER_CONF_END }
+ };
+ 
+-static CamelProvider spool_provider = {
++static CamelProvider spool_file_provider = {
+ 	"spool",
+-	N_("Standard Unix mbox spool or directory"),
++	N_("Standard Unix mbox spool file"),
+ 	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
+ 	"mail",
+ 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
+@@ -120,6 +120,17 @@
+ 	/* ... */
+ };
+ 
++static CamelProvider spool_directory_provider = {
++	"spooldir",
++	N_("Standard Unix mbox spool directory"),
++	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
++	"mail",
++	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
++	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
++	spool_conf_entries,
++	/* ... */
++};
++
+ #endif
+ 
+ /* build a canonical 'path' */
+@@ -233,13 +244,19 @@
+ 	camel_provider_register(&mbox_provider);
+ 
+ #ifndef G_OS_WIN32
+-	spool_conf_entries[0].value = path;  /* default path - same as mbox */
+-	spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
+-	spool_provider.url_hash = local_url_hash;
+-	spool_provider.url_equal = local_url_equal;
+-	spool_provider.translation_domain = GETTEXT_PACKAGE;
+-	camel_provider_register(&spool_provider);
+-	
++	spool_conf_entries[0].value = path;  /* default path - same as mbox; it's for both file and directory */
++	spool_file_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
++	spool_file_provider.url_hash = local_url_hash;
++	spool_file_provider.url_equal = local_url_equal;
++	spool_file_provider.translation_domain = GETTEXT_PACKAGE;
++	camel_provider_register(&spool_file_provider);
++
++	spool_directory_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
++	spool_directory_provider.url_hash = local_url_hash;
++	spool_directory_provider.url_equal = local_url_equal;
++	spool_directory_provider.translation_domain = GETTEXT_PACKAGE;
++	camel_provider_register(&spool_directory_provider);
++
+ 	path = getenv("MAILDIR");
+ 	maildir_conf_entries[0].value = path ? path : "";  /* default path */
+ 	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type ();
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-newline-in-contacts.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-newline-in-contacts.patch
new file mode 100644
index 000000000000..6e3709f068e8
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.10-newline-in-contacts.patch
@@ -0,0 +1,26 @@
+2007-08-14  Milan Crha  <mcrha@redhat.com>
+
+** Fix for bug #356176 by Patrick Ohly
+
+  * libebook/e-vcard.c: (read_attribute_value):
+  Skip over folding by calling skip_newline() to find
+  the next real character after a backslash.
+
+http://bugzilla.gnome.org/show_bug.cgi?id=356176
+https://bugs.gentoo.org/show_bug.cgi?id=175516
+
+--- trunk/addressbook/libebook/e-vcard.c	2007/08/14 13:53:49	7954
++++ trunk/addressbook/libebook/e-vcard.c	2007/08/14 14:17:12	7955
+@@ -273,6 +273,12 @@
+ 				g_string_append_c (str, '\\');
+ 				break;
+ 			}
++
++			/* beware, there might be a line break due to folding,
++			 * need next real character
++			 */
++			lp = skip_newline (lp, quoted_printable);
++
+ 			switch (*lp) {
+ 			case 'n': g_string_append_c (str, '\n'); break;
+ 			case 'N': g_string_append_c (str, '\n'); break;