apply patch to fix subfolder problem with exchange. fixes #151048

Package-Manager: portage-2.1.2_pre3-r8

4 files changed, 176 insertions, 1 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 11b1a41810b8..3d6148d33fa4 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.96 2006/10/19 15:34:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.97 2006/11/01 15:50:07 allanonjl Exp $
+
+*evolution-data-server-1.8.1-r1 (01 Nov 2006)
+
+  01 Nov 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/evolution-data-server-1.8.1-inbox-folders.patch,
+  -evolution-data-server-1.8.0.ebuild, -evolution-data-server-1.8.1.ebuild,
+  +evolution-data-server-1.8.1-r1.ebuild:
+  apply patch to fix subfolder problem with exchange.  fixes #151048
 
   19 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   evolution-data-server-1.6.2.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..fd81dfb2806e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.8.1-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 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.8.1-r1.ebuild,v 1.1 2006/11/01 15:50:07 allanonjl Exp $
+
+inherit eutils 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"
+IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=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
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+RESTRICT="confcache"
+
+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 nntp)		\
+		$(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
+
+	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
+
+	# exchange-storage --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
+	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+	# Fix subfolders problem
+	epatch "${FILESDIR}"/${PN}-1.8.1-inbox-folders.patch
+
+#-------------Upstream GNOME look here -----------------#
+
+	# 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
+
+#---------------Upstream GNOME stop here---------------
+	eautoreconf
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		NSS_LIB=/usr/$(get_libdir)/nss
+		NSS_INC=/usr/include/nss
+		NSPR_LIB=/usr/$(get_libdir)/nspr
+		NSPR_INC=/usr/include/nspr
+
+		G2CONF="${G2CONF} \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB}     \
+			--with-nss-includes=${NSS_INC}   \
+			--with-nss-libs=${NSS_LIB}"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+
+	cd "${S}"
+	gnome2_src_compile
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.1-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.1-r1
new file mode 100644
index 000000000000..df3238c4e115
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.1-r1
@@ -0,0 +1,3 @@
+MD5 8c2fe35bcdc457e09728ed213e915d01 evolution-data-server-1.8.1.tar.bz2 7119647
+RMD160 64fc3e0a4e83bc5c2b7913441056ede7ca3caace evolution-data-server-1.8.1.tar.bz2 7119647
+SHA256 5fb63ea67899ba3d6f1866594a2f237609b36eb985e9621ee3cb494e15e71956 evolution-data-server-1.8.1.tar.bz2 7119647
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.1-inbox-folders.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.1-inbox-folders.patch
new file mode 100644
index 000000000000..c8b12b972fd7
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.1-inbox-folders.patch
@@ -0,0 +1,21 @@
+--- servers/exchange/storage/exchange-account.c.orig	2006-10-13 08:07:21.000000000 -0500
++++ servers/exchange/storage/exchange-account.c	2006-10-13 08:07:57.000000000 -0500
+@@ -1244,8 +1244,7 @@
+ 					      account->priv->identity_name,
+ 					      account->priv->identity_email,
+ 					      account->priv->source_uri,
+-					      account->priv->offline_sync);
+-	d(g_print ("exchange-account.c:setup_account_hierarchies:offline_sync=%d\n", account->priv->offline_sync));
++					      TRUE);
+ 
+ 	setup_hierarchy (account, hier);
+ 	g_free (phys_uri_prefix);
+@@ -1277,7 +1276,7 @@
+ 					      account->priv->identity_name,
+ 					      account->priv->identity_email,
+ 					      account->priv->source_uri,
+-					      account->priv->offline_sync);
++					      TRUE);
+ 	setup_hierarchy (account, hier);
+ 	g_free (phys_uri_prefix);
+