New version for GNOME 2.24. Message templates, webdav/google contacts plugin, custom header support while sending mails, enhanced calendar memory usage, sqlite based message summary, bonobo-less composer and quote support.

(Portage version: 2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 203 insertions, 1 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 594a6ec6ed2f..990347a5b9c4 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.249 2008/11/13 19:37:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.250 2008/12/01 13:03:31 eva Exp $
+
+  01 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
+  New version for GNOME 2.24. Message templates, webdav/google contacts
+  plugin, custom header support while sending mails, enhanced calendar
+  memory usage, sqlite based message summary, bonobo-less composer and quote
+  support.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> evolution-2.22.3.1.ebuild:
   Marking evolution-2.22.3.1 ppc64 stable for bug 236971
diff --git a/mail-client/evolution/evolution-2.24.2.ebuild b/mail-client/evolution/evolution-2.24.2.ebuild
new file mode 100644
index 000000000000..5cad76b69585
--- /dev/null
+++ b/mail-client/evolution/evolution-2.24.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.24.2.ebuild,v 1.1 2008/12/01 13:03:31 eva Exp $
+
+inherit gnome2 flag-o-matic libtool
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-libtool-hack.patch.bz2"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
+
+# Pango dependency required to avoid font rendering problems
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12
+	>=gnome-extra/evolution-data-server-2.23.91
+	>=x11-themes/gnome-icon-theme-2.20
+	>=gnome-base/libbonobo-2.20.3
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-extra/gtkhtml-3.23.5
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libgnomeui-2
+	>=dev-libs/libxml2-2
+	>=x11-misc/shared-mime-info-0.22
+	dbus? ( dev-libs/dbus-glib )
+	hal? ( >=sys-apps/hal-0.5.4 )
+	x11-libs/libnotify
+	pda? (
+		>=app-pda/gnome-pilot-2.0.15
+		>=app-pda/gnome-pilot-conduits-2 )
+	dev-libs/atk
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )
+	networkmanager? ( net-misc/networkmanager )
+	>=net-libs/libsoup-2.4
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	>=gnome-base/orbit-2.9.8
+	spell? ( >=app-text/gnome-spell-1.0.5 )
+	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
+	ldap? ( >=net-nds/openldap-2 )
+	mono? ( >=dev-lang/mono-1 )"
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.10
+#		>=media-libs/gst-plugins-base-0.10 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=dev-util/intltool-0.35.5
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/gnome-doc-utils-0.9.1"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+pkg_setup() {
+	G2CONF="--without-kde-applnk-path
+		--enable-plugins=experimental
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable ipv6)
+		$(use_enable mono)
+		$(use_enable nntp)
+		$(use_enable pda pilot-conduits)
+		$(use_enable profile profiling)
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 /usr)"
+
+	# We need a graphical pinentry frontend to be able to ask for the GPG
+	# password from inside evolution, bug 160302
+	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT3 support"
+		fi
+	fi
+
+	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
+
+	# dang - I've changed this to do --enable-plugins=experimental.  This will
+	# autodetect new-mail-notify and exchange, but that cannot be helped for the
+	# moment.  They should be changed to depend on a --enable-<foo> like mono
+	# is.  This cleans up a ton of crap from this ebuild.
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix timezone offsets on fbsd.  bug #183708
+	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
+
+	# Fix delete keyboard shortcut
+	epatch "${FILESDIR}"/${PN}-2.23.3.1-delete-key.patch
+
+	# Ugly hack, bug #235154
+	epatch "${WORKDIR}/${P}-libtool-hack.patch"
+}
+
+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
+
+	# problems with -O3 on gcc-3.3.1
+	replace-flags -O3 -O2
+
+	# Bug #?
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To change the default browser if you are not using GNOME, do:"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	elog ""
+	elog "Replace 'mozilla %s' with which ever browser you use."
+	elog ""
+	elog "Junk filters are now a run-time choice. You will get a choice of"
+	elog "bogofilter or spamassassin based on which you have installed"
+	elog ""
+	elog "You have to install one of these for the spam filtering to actually work"
+}
diff --git a/mail-client/evolution/files/evolution-2.23.3.1-delete-key.patch b/mail-client/evolution/files/evolution-2.23.3.1-delete-key.patch
new file mode 100644
index 000000000000..5dea769bb971
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.23.3.1-delete-key.patch
@@ -0,0 +1,42 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-2.23.3.1.orig/mail/em-folder-view.c evolution-2.23.3.1/mail/em-folder-view.c
+--- evolution-2.23.3.1.orig/mail/em-folder-view.c	2008-06-02 03:51:43.000000000 -0400
++++ evolution-2.23.3.1/mail/em-folder-view.c	2008-06-03 11:16:19.000000000 -0400
+@@ -175,7 +175,6 @@ static const EMFolderViewEnable emfv_ena
+ 	{ "MessageFilterJunk",        EM_POPUP_SELECT_MANY },
+ 	{ "MessageCopy",              EM_POPUP_SELECT_MANY },
+ 	{ "MessageDelete",            EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE },
+-	{ "MessageDeleteKey",         EM_POPUP_SELECT_MANY},	
+ 	{ "MessageForward",           EM_POPUP_SELECT_MANY },
+ 	{ "MessageForwardAttached",   EM_POPUP_SELECT_MANY },
+ 	{ "MessageForwardInline",     EM_POPUP_SELECT_ONE },
+@@ -2063,7 +2062,6 @@ static BonoboUIVerb emfv_message_verbs[]
+ 	BONOBO_UI_UNSAFE_VERB ("MessageFilterJunk", emfv_message_filter_junk),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageCopy", emfv_message_copy),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageDelete", emfv_message_delete),
+-	BONOBO_UI_UNSAFE_VERB ("MessageDeleteKey", emfv_message_delete),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageForward", emfv_message_forward),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", emfv_message_forward_attached),
+ 	BONOBO_UI_UNSAFE_VERB ("MessageForwardInline", emfv_message_forward_inline),
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-2.23.3.1.orig/ui/evolution-mail-message.xml evolution-2.23.3.1/ui/evolution-mail-message.xml
+--- evolution-2.23.3.1.orig/ui/evolution-mail-message.xml	2008-06-02 03:51:43.000000000 -0400
++++ evolution-2.23.3.1/ui/evolution-mail-message.xml	2008-06-03 11:16:19.000000000 -0400
+@@ -58,6 +58,7 @@
+ 
+     <cmd name="MessageDelete"
+      _tip="Mark the selected messages for deletion"
++     accel="*Control*d"
+      pixtype="pixbuf"/>
+ 
+     <cmd name="MessageFollowUpFlag"
+@@ -243,9 +244,8 @@
+     <accel verb="MailNextUnread"     name="*Control*period"/>
+     <accel verb="MailNextUnread"     name="period"/>
+     <accel verb="MailNextUnread"     name="bracketright"/>
+-    <accel verb="MessageDeleteKey"   name="Delete"/>
+-    <accel verb="MessageDeleteKey"   name="KP_Delete"/>
+-    <accel verb="MessageDeleteKey"   name="*Control*d"/>
++    <accel verb="MessageDelete"      name="Delete"/>
++    <accel verb="MessageDelete"      name="KP_Delete"/>
+   </keybindings>
+ 
+   <menu>