Apply patch from upstream, fixing bug #87043 (Evolution mail folder pane doesn't update).

Package-Manager: portage-2.0.51.22-r1

5 files changed, 123 insertions, 2 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 059e32693032..548c5f4f8030 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.39 2005/05/18 01:44:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.40 2005/06/09 08:59:29 brix Exp $
+
+*evolution-data-server-1.2.1-r1 (09 Jun 2005)
+
+  09 Jun 2005; <brix@gentoo.org>
+  +files/evolution-data-server-1.2.1-local-provider.patch,
+  +evolution-data-server-1.2.1-r1.ebuild:
+  Apply patch from upstream, fixing bug #87043 (Evolution mail folder pane
+  doesn't update).
 
   18 May 2005; Jason Wever <weeve@gentoo.org>
   evolution-data-server-1.0.4.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index d4c0540e8b3c..216e99568fa5 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,13 +1,15 @@
 MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
+MD5 60b5b5e2921acde8afe0a8fab342e3a1 evolution-data-server-1.2.1-r1.ebuild 2415
 MD5 a3403c6784d7ed4349529e607a836411 evolution-data-server-1.2.1.ebuild 2366
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
 MD5 4dbe4199e9831b2797fb93b7a19c42fb evolution-data-server-1.2.0-r1.ebuild 2365
 MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
 MD5 1097e1ac343ae36a49a3da3824b3d624 evolution-data-server-1.2.0.ebuild 1249
 MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
-MD5 1654185d8c34b80b977753c39292fbcc ChangeLog 5428
+MD5 bf6569dfcbd2010273098ce842ec147c ChangeLog 5703
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0-r1 81
+MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
 MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
 MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
@@ -16,3 +18,4 @@ MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0 81
 MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1 81
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
+MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.2.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..e6d31792f79e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.2.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 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.2.1-r1.ebuild,v 1.1 2005/06/09 08:59:29 brix Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.ximian.com/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~ppc64"
+IUSE="doc ldap mozilla ssl ipv6 nntp kerberos"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.2.2
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? ( mozilla? ( www-client/mozilla )
+		  !mozilla? ( >=dev-libs/nspr-4.4
+					  >=dev-libs/nss-3.9 )
+		   )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.30
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+G2CONF="${G2CONF} `use_with ldap openldap` \
+		`use_enable ssl nss` \
+		`use_enable ssl smime` \
+		`use_enable ipv6` \
+	    `use_enable nntp`"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+USE_DESTDIR=1
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+	epatch ${FILESDIR}/${P}-local-provider.patch
+}
+
+src_compile() {
+	cd ${S}/libdb/dist
+	./s_config || die
+
+	cd ${S}
+	local myconf=""
+
+	use kerberos \
+		&& myconf="${myconf} --with-krb5=/usr" \
+		|| myconf="${myconf} --without-krb5"
+
+	# Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
+	# Use standalone NSS/NSPR if only 'ssl' in USE
+	# Openssl support doesn't work and has been disabled in cvs
+
+	if use ssl ; then
+		if  use mozilla ; then
+			NSS_LIB=/usr/$(get_libdir)/mozilla
+			NSPR_LIB=/usr/$(get_libdir)/mozilla
+			NSS_INC=/usr/$(get_libdir)/mozilla/include/nss
+			NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr
+		else
+			NSS_LIB=/usr/$(get_libdir)/nss
+			NSPR_LIB=/usr/$(get_libdir)/nspr
+			NSS_INC=/usr/include/nss
+			NSPR_INC=/usr/include/nspr
+		fi
+
+		myconf="${myconf} --enable-nss=yes \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB} \
+			--with-nss-includes=${NSS_INC} \
+			--with-nss-libs=${NSS_LIB}"
+	else
+		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
+		--without-nss-libs --without-nss-includes"
+	fi
+
+	gnome2_src_configure ${G2CONF} ${myconf}
+	emake || die "compile failed"
+
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.1-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.1-r1
new file mode 100644
index 000000000000..8feb176d6f6b
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.2.1-r1
@@ -0,0 +1 @@
+MD5 c86cc41c1563f552015aebb563018936 evolution-data-server-1.2.1.tar.bz2 7454633
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.1-local-provider.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.1-local-provider.patch
new file mode 100644
index 000000000000..776095bd9220
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.1-local-provider.patch
@@ -0,0 +1,17 @@
+diff -urp evolution-data-server-1.2.1/camel/providers/local/camel-local-provider.c evolution-data-server-1.2.1-local-provider/camel/providers/local/camel-local-provider.c
+--- evolution-data-server-1.2.1/camel/providers/local/camel-local-provider.c	2004-09-20 07:59:54.000000000 +0200
++++ evolution-data-server-1.2.1-local-provider/camel/providers/local/camel-local-provider.c	2005-06-08 17:22:28.000000000 +0200
+@@ -188,12 +188,7 @@ local_url_equal(const void *v, const voi
+ 	p1 = get_can_path(u1->path);
+ 	p2 = get_can_path(u2->path);
+ 	return check_equal(p1, p2)
+-		&& check_equal(u1->protocol, u2->protocol)
+-		&& check_equal(u1->user, u2->user)
+-		&& check_equal(u1->authmech, u2->authmech)
+-		&& check_equal(u1->host, u2->host)
+-		&& check_equal(u1->query, u2->query)
+-		&& u1->port == u2->port;
++		&& check_equal(u1->protocol, u2->protocol);
+ }
+ 
+ void camel_provider_module_init(void)