Version bump. Use non-virtual dependency for kerberos4, bug #277218. Add patch to fix camel search folder hang, bug #277864.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 152 insertions, 1 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 498c8e66eea5..a65cf558e059 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.233 2009/05/31 13:23:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.234 2009/07/20 21:50:54 eva Exp $
+
+*evolution-data-server-2.26.3 (20 Jul 2009)
+
+  20 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +evolution-data-server-2.26.3.ebuild,
+  +files/evolution-data-server-2.26.3-camel-vee-folder.patch:
+  Version bump. Use non-virtual dependency for kerberos4, bug #277218. Add
+  patch to fix camel search folder hang, bug #277864.
 
   31 May 2009; Brent Baude <ranger@gentoo.org>
   evolution-data-server-2.26.2.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.26.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.26.3.ebuild
new file mode 100644
index 000000000000..09722c85ce3b
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.26.3.ebuild
@@ -0,0 +1,119 @@
+# 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.26.3.ebuild,v 1.1 2009/07/20 21:50:54 eva Exp $
+
+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 ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
+
+RDEPEND=">=dev-libs/glib-2.16.1
+	>=x11-libs/gtk+-2.14
+	>=gnome-base/orbit-2.9.8
+	>=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
+	>=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 )
+	>=gnome-base/libgnomeui-2
+	sys-libs/zlib
+	=sys-libs/db-4*
+	ldap? ( >=net-nds/openldap-2.0 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( app-crypt/mit-krb5[krb4] )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+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)"
+}
+
+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}-2.25.90-no-libdb.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+	# Fix building evo-exchange with --as-needed, upstream bug #342830
+	# and configure failing to detect kerberos5-libs with as-needed
+	epatch "${FILESDIR}"/${PN}-2.25.5-as-needed.patch
+
+	# Fix hang while updating search folders, bug #277864, upstream bug #583507
+	epatch "${FILESDIR}/${PN}-2.26.3-camel-vee-folder.patch"
+
+	# gtk-doc-am and gnome-common needed for this
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# 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 || die "sed failed"
+		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)"
+}
+
+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
+
+}
+
+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-2.26.3-camel-vee-folder.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.3-camel-vee-folder.patch
new file mode 100644
index 000000000000..18387571be58
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.3-camel-vee-folder.patch
@@ -0,0 +1,24 @@
+Fix hand while updating search folders
+
+Gnome: http://bugzilla.gnome.org/show_bug.cgi?id=583507
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=277864
+diff -up a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
+--- a/camel/camel-vee-folder.c	2009-06-26 08:36:57.000000000 -0400
++++ b/camel/camel-vee-folder.c	2009-07-14 14:10:51.000000000 -0400
+@@ -1533,12 +1533,14 @@ folder_changed_change(CamelSession *sess
+ 	}
+ 
+ 	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
+-	if (matches_changed || matches_added || changes->uid_removed->len||present)
+-		camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
+ 
+ 	if (folder_unmatched != NULL)
+ 		CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);
+ 
++	if (matches_changed || matches_added || changes->uid_removed->len||present)
++		camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
++
++
+ 	dd(printf("Vfolder '%s' subfolder changed '%s'\n", folder->full_name, sub->full_name));
+ 	dd(printf(" changed %u added %u removed %u\n", changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
+