bump to 2.22.3-r1, backport upstream bug fixes announced on distributor list.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.24-gentoo-r8 i686

5 files changed, 285 insertions, 5 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 422c99aada98..c1e6a542d3be 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.189 2008/10/06 21:14:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.190 2008/10/12 16:29:01 eva Exp $
+
+*evolution-data-server-2.22.3-r1 (12 Oct 2008)
+
+  12 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/evolution-data-server-2.22.3-mail-cleanup-delay.patch,
+  +files/evolution-data-server-2.22.3-timezone-western.patch,
+  +evolution-data-server-2.22.3-r1.ebuild:
+  bump to 2.22.3-r1, backport upstream bug fixes announced on distributor
+  list.
 
   06 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
   evolution-data-server-1.12.3.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index fbd43b145ea8..327e593b2b65 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -11,19 +11,22 @@ AUX evolution-data-server-1.8.0-camel-rewind.patch 499 RMD160 90b94f0b20a52a4fdf
 AUX evolution-data-server-2.21.4-as-needed.patch 3339 RMD160 437d0a2ca704c12b0ef84d42bd30c5f309993192 SHA1 13527a0ab7486d95a21b1b60d8d8f23e65df1495 SHA256 9d64f94d8b2ccae4f3de0c1d8a35ae072357821829f17c83c012902542f47beb
 AUX evolution-data-server-2.21.4-gtkdoc-rebase.patch 739 RMD160 ed666a6e4118008bc69c96a1dfbfd4d879ecb597 SHA1 049a232cd8b664f949ef9834fd313c9e4b32998d SHA256 bbbd971fa4cba06c77fdd55874e4a29a4eb6afc02db7a2f1e5d4882eeae047b1
 AUX evolution-data-server-2.21.90-icaltz-util.patch 1343 RMD160 60db5a03375636b21eb968de35f032e915319277 SHA1 b3d7f3dd6dc32927265a410b82193972198143b0 SHA256 0279c058ad3f06e3703c4876decc644d6fbc18663f5f9c9e470cd31b1735b2a3
+AUX evolution-data-server-2.22.3-mail-cleanup-delay.patch 2974 RMD160 b482fbd815f1853522d845fa3acf643dbb5ebac8 SHA1 bae6f30319ea13d0b4c1aed63b92cf9f23f39c29 SHA256 3be97d843539c285a36af973145d3cc8bec99b84a54282eab0900df867b030c4
+AUX evolution-data-server-2.22.3-timezone-western.patch 2041 RMD160 8a0d9e308123ebc48a6ea9c7932c8639765a96b8 SHA1 963f7c7a0659a4ca6659f5983e8a47825c70b8e9 SHA256 56e3311334bac728db2c7afcd200e56acc3e0a9819659cdffb745c488bbb4126
 AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403
 DIST evolution-data-server-1.12.3.tar.bz2 7447166 RMD160 c7102c38af4888f3f8933c9d28981d1809d504f8 SHA1 12b8b23fb77ff6436def3cc5ea472886c8e0350e SHA256 e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5
 DIST evolution-data-server-2.22.2.tar.bz2 7613774 RMD160 92677046697b0f48b273ad3fb3fbf656dac02e5b SHA1 d3fc33802fec51a16b017abb7516f4ed79311dfa SHA256 dc86b3f61cc4f9db08012deee692774562cfc93a3313298517fca8639a6eb3de
 DIST evolution-data-server-2.22.3.tar.bz2 7621470 RMD160 eed9c26fba0b69f0cbe44b01d698388c4ae44a0b SHA1 5d01b1248fcacef9c478787892f223338dff731b SHA256 6e9fa1258c8b4d1fd75a1da78ee637ad5b8a82bc58c93324d73afecf8d73fe87
 EBUILD evolution-data-server-1.12.3.ebuild 5047 RMD160 47e7a7a27fc51270a57644179594e302ffe11a73 SHA1 8e819d7c74c140aed79e5f265082a96541dbdb74 SHA256 482df2b372d83beaf408af1b0d6e7162d52481eef0513a25b6f9fc1805e7a229
 EBUILD evolution-data-server-2.22.2.ebuild 3121 RMD160 b25a0c60d2724073c6fa7a12ef05d37ff64c5c51 SHA1 7792a7a2f0902fd55cfad7dc7a5099ae3b31e3df SHA256 6e2bb7b8b57d839a35bfac3ed3b970da6a3088ca23985170a2941aaf78eb1ece
+EBUILD evolution-data-server-2.22.3-r1.ebuild 3237 RMD160 c46050274c8c1140e2274614879a359fab45821c SHA1 0aef82139ee98b2be0f0a4483a7d79bd528a8a38 SHA256 58c511ed07f041a90ddd8e42132540857b260590c96f22f598747921b463c5d6
 EBUILD evolution-data-server-2.22.3.ebuild 3117 RMD160 fc3c621e1b137ec7cc69118d06ce97931802c913 SHA1 2f03525e06934cfc12512b237faeacdfec412315 SHA256 790f1860f63695c51664e6eb5cebd94fd2ccbb3f77e1814422cb16bcf8b83920
-MISC ChangeLog 36294 RMD160 cf146f2fb7ee60e0778ebe4bfc16ce5d9769e5ac SHA1 224fc3f505da79842600cffa0541c7938f0c894a SHA256 09a4cb522836ae8f001088a94d9f8a515dbbd58a73c8383d2ec89980eba2b32c
+MISC ChangeLog 36648 RMD160 b9ef6e4ecbe54b9b0273e630e3d3c14985bf1df9 SHA1 de3b622b8e496989da6d2ddb9f1f56e13b0614c6 SHA256 9624847d48ed800c42309d2fc2e1e1e740d9923acdcab59de6e41c9835e595f5
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjqf6UACgkQ1fmVwcYIWAY0jQCg2E80lZjIX/l2JNjjh/U7i8Lg
-GvIAoIt7j/bgvmiL8fCDnpoclLAtVtD7
-=0k9L
+iEYEARECAAYFAkjyJdkACgkQ1fmVwcYIWAaoZgCgjII9vBi4Sh+Rcgfd+Zzq66Rc
+yGUAn3LGqvytC5Ef088QLi2jFXtsp+Ew
+=eNpn
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.22.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.22.3-r1.ebuild
new file mode 100644
index 000000000000..70578f35a91e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.22.3-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 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.22.3-r1.ebuild,v 1.1 2008/10/12 16:29:01 eva 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 gnome-keyring krb4 ldap ssl"
+
+RDEPEND=">=dev-libs/glib-2.15.3
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/gnome-vfs-2.4
+	>=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
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
+	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? ( virtual/krb5 )"
+
+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 kerberos krb5 /usr)
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable ipv6)
+		$(use_enable 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
+
+	# Adjust to gentoo's /etc/service
+	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
+
+	# Fix broken libdb build
+	epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+	# Don't assume that endian.h and byteswap.h exist on all non sun os's
+	epatch "${FILESDIR}"/${PN}-2.21.90-icaltz-util.patch
+
+	# Don't error out if gtkdoc-rebase doesn't exist.
+	epatch "${FILESDIR}"/${PN}-2.21.4-gtkdoc-rebase.patch
+
+	# Fix building evo-exchange with --as-needed
+	epatch "${FILESDIR}"/${PN}-2.21.4-as-needed.patch
+
+	# Fix automatic mail delete after X days, upstream bug #514827
+	epatch "${FILESDIR}"/${P}-mail-cleanup-delay.patch
+
+	# Fix calculation of weekday, upstream bug #548268
+	epatch "${FILESDIR}"/${P}-timezone-western.patch
+
+	# gtk-doc-am and gnome-common needed for this
+	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/evolution-data-server-2.22.3-mail-cleanup-delay.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch
new file mode 100644
index 000000000000..51030a14df37
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch
@@ -0,0 +1,98 @@
+---
+
+At http://bugzilla.gnome.org/show_bug.cgi?id=514827
+
+I have POP account in web.de
+I would like to leave in server only 1 days, and older messages should be
+deleted.
+I tried to do this with the pop account preference setting:
+x Leave messages on server
+x Delete messages older than 1 days
+
+However, the messages are still kept in the server although it is more than
+several days. 
+
+Index: b/camel/providers/pop3/camel-pop3-folder.c
+===================================================================
+--- a/camel/providers/pop3/camel-pop3-folder.c	(revision 9476)
++++ b/camel/providers/pop3/camel-pop3-folder.c	(working copy)
+@@ -356,6 +356,48 @@
+ 	camel_pop3_store_expunge (pop3_store, ex);
+ }
+ 
++static gboolean
++pop3_get_message_time_from_cache (CamelFolder *folder, const char *uid, time_t *message_time)
++{
++	CamelPOP3Store *pop3_store;
++	CamelStream *stream = NULL;
++	char buffer[1];
++	gboolean res = FALSE;
++
++	g_return_val_if_fail (folder != NULL, FALSE);
++	g_return_val_if_fail (uid != NULL, FALSE);
++	g_return_val_if_fail (message_time != NULL, FALSE);
++
++	pop3_store = CAMEL_POP3_STORE (folder->parent_store);
++
++	g_return_val_if_fail (pop3_store->cache != NULL, FALSE);
++
++	if ((stream = camel_data_cache_get (pop3_store->cache, "cache", uid, NULL)) != NULL
++	    && camel_stream_read (stream, buffer, 1) == 1
++	    && buffer[0] == '#') {
++		CamelMimeMessage *message;
++
++		message = camel_mime_message_new ();
++		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)message, stream) == -1) {
++			g_warning (_("Cannot get message %s: %s"), uid, g_strerror (errno));
++			camel_object_unref ((CamelObject *)message);
++			message = NULL;
++		}
++
++		if (message) {
++			res = TRUE;
++			*message_time = message->date + message->date_offset;
++
++			camel_object_unref ((CamelObject *)message);
++		}
++	}
++
++	if (stream) {
++		camel_object_unref (stream);
++	}
++	return res;
++}
++
+ int
+ camel_pop3_delete_old(CamelFolder *folder, int days_to_delete,	CamelException *ex)
+ {
+@@ -363,8 +405,7 @@
+ 	CamelPOP3FolderInfo *fi;
+ 	int i;
+ 	CamelPOP3Store *pop3_store;
+-	time_t temp;
+-	CamelMessageInfo *minfo;
++	time_t temp, message_time;
+ 
+ 	pop3_folder = CAMEL_POP3_FOLDER (folder);
+ 	pop3_store = CAMEL_POP3_STORE (CAMEL_FOLDER(pop3_folder)->parent_store);
+@@ -374,10 +415,8 @@
+ 	for (i = 0; i < pop3_folder->uids->len; i++) {
+ 		fi = pop3_folder->uids->pdata[i];
+ 
+-		minfo = camel_folder_get_message_info (folder, fi->uid);
+ 		d(printf("%s(%d): fi->uid=[%s]\n", __FILE__, __LINE__, fi->uid));
+-		if(minfo) {
+-			time_t message_time = ((CamelMessageInfoBase *)minfo)->date_received;
++		if (pop3_get_message_time_from_cache (folder, fi->uid, &message_time)) {
+ 			double time_diff = difftime(temp,message_time);
+ 			int day_lag = time_diff/(60*60*24);
+ 
+@@ -407,8 +446,6 @@
+ 					camel_data_cache_remove(pop3_store->cache, "cache", fi->uid, NULL);
+ 				}
+ 			}
+-			/* free message - not used anymore */
+-			camel_folder_free_message_info (folder, minfo);
+ 		}
+ 	}
+ 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch
new file mode 100644
index 000000000000..e1a4e6c2a12d
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch
@@ -0,0 +1,54 @@
+---
+At http://bugzilla.gnome.org/show_bug.cgi?id=548268
+
+As discussed in bug #528902, Evolution now uses time zone information extracted
+from the binary system time zone database.
+
+This conversion fails in at least in one case: Germany's (and therefore
+probably much of Western Europe) switch from summer saving time to normal time
+is exported in iCalendar events as [...]
+
+Index: b/calendar/libical/src/libical/icaltz-util.c
+===================================================================
+--- a/calendar/libical/src/libical/icaltz-util.c	(revision 646)
++++ b/calendar/libical/src/libical/icaltz-util.c	(working copy)
+@@ -198,6 +198,21 @@ icaltzutil_get_zone_directory (void)
+ 	return zdir;
+ }
+ 
++/* Calculate the relative position of the week in a month from a date */
++static int
++calculate_pos (icaltimetype icaltime)
++{
++	int pos;
++
++	pos = (icaltime.day -1) / 7;
++
++	/* Check if pos 3 is the last occurence of the week day in the month */	
++	if (pos == 3 && ((icaltime.day + 7) > icaltime_days_in_month (icaltime.month, icaltime.year))) 
++		pos = 4;
++
++	return r_pos [pos];
++}
++
+ icalcomponent*
+ icaltzutil_fetch_timezone (const char *location)
+ {
+@@ -349,7 +364,7 @@ icaltzutil_fetch_timezone (const char *l
+ 			icalrecurrencetype_clear (&ical_recur);
+ 			ical_recur.freq = ICAL_YEARLY_RECURRENCE;
+ 			ical_recur.by_month [0] = icaltime.month;
+-			pos = r_pos [icaltime.day/7];
++			pos = calculate_pos (icaltime);
+ 			pos < 0 ? (sign = -1): (sign = 1);
+ 			ical_recur.by_day [0] = sign * ((abs (pos) * 8) + icaltime_day_of_week (icaltime));
+ 			icalprop = icalproperty_new_rrule (ical_recur);
+@@ -387,7 +402,7 @@ icaltzutil_fetch_timezone (const char *l
+ 		icalrecurrencetype_clear (&ical_recur);
+ 		ical_recur.freq = ICAL_YEARLY_RECURRENCE;
+ 		ical_recur.by_month [0] = icaltime.month;
+-		pos = r_pos [icaltime.day/7];
++		pos = calculate_pos (icaltime);
+ 		pos < 0 ? (sign = -1): (sign = 1);
+ 		ical_recur.by_day [0] = sign * ((abs (pos) * 8) + icaltime_day_of_week (icaltime));
+ 		icalprop = icalproperty_new_rrule (ical_recur);