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

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

4 files changed, 166 insertions, 2 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/Manifest b/gnome-extra/evolution-data-server/Manifest
index 5f77433aabb9..3da6cec2d7a0 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
 AUX evolution-data-server-1.11.3-no-libdb.patch 570 RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 SHA1 411f311317439bf20643491d2b7d1cbee99c561e SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905
 AUX evolution-data-server-1.2.0-gentoo_etc_services.patch 815 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 SHA1 9248c74b334534f74e027fc119509673bff4542f SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a
@@ -7,10 +10,20 @@ AUX evolution-data-server-2.24.5-CVE-2009-0547.patch 3977 RMD160 24bd47ad13994f7
 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-2.26.2-as-needed-configure.patch 1340 RMD160 5416a13e32348c09950185bf2c243fdd06233fdd SHA1 9976709eb0107399aa9e21eafa3cabfc6176407d SHA256 725eb2213c73ef52c7dd27224abec3b3cd3ba25408e797a74d309b3305151399
+AUX evolution-data-server-2.26.3-camel-vee-folder.patch 1072 RMD160 5ea77f129629744e8b147cf707b6dee16b21d7dc SHA1 f8a3383c841edb5f345dced8a99fc38c9d6d28e9 SHA256 4bd7b35d7ba55e5a452aeeef1d96e2372d6312f533489259f7b777b0a6963ff4
 AUX evolution-data-server-CVE-2009-0582.patch 4651 RMD160 348f25abea3f513f170ca159923fc836ebafae42 SHA1 2d6b8ff93c43cf9e107de93c64be9df4d9b9a6d4 SHA256 b320f3efdbb19ddbf618be77cc4b52e5f422209b48273b5f62c7158b6efe618a
 DIST evolution-data-server-2.24.5.tar.bz2 7857405 RMD160 d5f32f35a51e32885f96d4f92d7a0c6fae249a92 SHA1 b1df1f3580e3566d08faf2c093a685ee977d648c SHA256 c2240b96437f36f3656da538df7631510785664a6e7723cbf75ec0f88c3d38d1
 DIST evolution-data-server-2.26.2.tar.bz2 7257425 RMD160 c8ede51a8537dc9db96a796a0904f0fedcc25f37 SHA1 ca60a350259c6bc297cc0c324c5908a3d08ac4e3 SHA256 f09605100c3edba699818831ac6d8f6c94899416ba0959ded3a0292bbb79a22f
+DIST evolution-data-server-2.26.3.tar.bz2 7167764 RMD160 83f68a464a0cfb50511f33e662d8a24ede42b9e6 SHA1 a9406b748d5a002df9570d17c91066575f2ba408 SHA256 ed2698d64dc663900b50f7a461d79c25e310462b7d41b1073257cbf950e75071
 EBUILD evolution-data-server-2.24.5-r2.ebuild 3644 RMD160 f2855d5980b83b1e8bf92e2659dd8edd344a6033 SHA1 0aa8435b6de24ea786802d1ef1033e7cb5db1d1a SHA256 ba3c8f1ddb5d56069e824d0f27a98e1b06b53d56d8e866dea50bc53e09072738
 EBUILD evolution-data-server-2.26.2.ebuild 3219 RMD160 b1d87b3bf7fe7ce2f720c38df57e8b230a4b3b9d SHA1 f1c85d46cd6a75cba9247eadf8050250c87ca4e0 SHA256 9b23fd003cc491da8e1ef3ffaf97158d4953ecf4cc997afc179651fc6cac43e3
-MISC ChangeLog 44429 RMD160 ad0b656e2b8a7a31c411cb2f4945f8e75d0f8764 SHA1 2ab620d6e6b1dff639b617b1724a8d01ad3e6f1a SHA256 f97824c31efc8cf8a58e38f8952fe2a7b49c0c6fd5c56cd0529833a4cc772288
+EBUILD evolution-data-server-2.26.3.ebuild 3305 RMD160 c7cd29cc84f6b467928a5dd89d90d4111a9cbeb5 SHA1 2e52c66318783bfafa8a64bee7d57569635694f8 SHA256 7a30d00659b6b032e2fa33fa8ae3ec079d551e54778b413ce8160e1aae47ae3b
+MISC ChangeLog 44757 RMD160 677459d060b2af1ad081800cc15ae20606d37dd2 SHA1 f4fd728a3d2e121212dc81dd72d5a44e7fe13298 SHA256 d7f465b0dcb1cf131098b87f0a46b462c47bfe7402d553e77c6cc64cc575ca1a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpk5sgACgkQ1fmVwcYIWAY0YgCg5qPhAlkZQEIeCbTV67kS8lY5
+X6QAoLcbZHt8lVb21nkCdntMcdKMULra
+=118Y
+-----END PGP SIGNATURE-----
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));
+