New revision, added patch to avoid a segfault (bug #104587)

(Portage version: 2.0.51.22-r2)

7 files changed, 43 insertions, 203 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index eeebf501187f..77b8c2b20d25 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.97 2005/08/24 16:08:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.98 2005/09/02 14:12:18 leonardop Exp $
+
+*evolution-2.3.8-r1 (02 Sep 2005)
+
+  02 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/evolution-2.3.8-gentoo.patch, -evolution-2.3.7-r1.ebuild,
+  -evolution-2.3.8.ebuild, +evolution-2.3.8-r1.ebuild:
+  Added patch to work-around a segmentation fault (bug #104587).
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org> evolution-2.2.3-r3.ebuild:
   stable on ia64
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 71563c98e6b0..4d5b041a820b 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,26 +1,29 @@
-MD5 d8024d9a332479c760153e4127418d72 evolution-2.3.7-r1.ebuild 5719
+MD5 09565a3f549842e4ab81b898f4d9450c ChangeLog 29949
+MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
+MD5 7d057574eb7a3eb2cfc3baa9ab2577fc evolution-2.3.8.ebuild 5716
 MD5 3c3a045e22357b7bbb98e000ebf161c1 evolution-2.2.3-r3.ebuild 6063
+MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
 MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
-MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
-MD5 09565a3f549842e4ab81b898f4d9450c ChangeLog 29949
 MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
-MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
-MD5 7d057574eb7a3eb2cfc3baa9ab2577fc evolution-2.3.8.ebuild 5716
-MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
-MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
-MD5 b01eb668892c7f791e63131a0c2c5e9f files/digest-evolution-2.3.7-r1 70
-MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
+MD5 d8024d9a332479c760153e4127418d72 evolution-2.3.7-r1.ebuild 5719
+MD5 43bb5a23c60092826800ee930618831e evolution-2.3.8-r1.ebuild 5755
 MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
-MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
+MD5 b90f83e3612e50586f0b79f4495a9c39 files/digest-evolution-2.3.8 70
+MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
+MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
 MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491
-MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
-MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
-MD5 56a0d793e598c8e0c91ec5ab0e2a4e4b files/evolution.formatstring.patch 2146
-MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 b90f83e3612e50586f0b79f4495a9c39 files/digest-evolution-2.3.8 70
-MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
-MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r3 70
-MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
+MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
+MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
+MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
+MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
+MD5 b01eb668892c7f791e63131a0c2c5e9f files/digest-evolution-2.3.7-r1 70
+MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r3 70
+MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
+MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
+MD5 56a0d793e598c8e0c91ec5ab0e2a4e4b files/evolution.formatstring.patch 2146
+MD5 b90f83e3612e50586f0b79f4495a9c39 files/digest-evolution-2.3.8-r1 70
diff --git a/mail-client/evolution/evolution-2.3.7-r1.ebuild b/mail-client/evolution/evolution-2.3.8-r1.ebuild
index 06c876336b98..82bca9f586b4 100644
--- a/mail-client/evolution/evolution-2.3.7-r1.ebuild
+++ b/mail-client/evolution/evolution-2.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.3.7-r1.ebuild,v 1.1 2005/08/21 04:14:00 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.3.8-r1.ebuild,v 1.1 2005/09/02 14:12:18 leonardop Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -153,6 +153,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
 	# Fix for linking problems, #85013 and #92682
 	epatch ${FILESDIR}/${PN}-2.2.3-linking-fix.patch
+	# Possible work-around for a start-up segfault (bug #104587).
+	epatch ${FILESDIR}/${P}-gentoo.patch
 
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
diff --git a/mail-client/evolution/evolution-2.3.8.ebuild b/mail-client/evolution/evolution-2.3.8.ebuild
deleted file mode 100644
index e4251f3a6b78..000000000000
--- a/mail-client/evolution/evolution-2.3.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.3.8.ebuild,v 1.1 2005/08/23 13:16:00 allanonjl Exp $
-
-inherit eutils flag-o-matic alternatives gnome2
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda spell ssl static"
-
-# Top stanza are ximian deps
-# Pango dependency required to avoid font rendering problems
-RDEPEND=">=x11-themes/gnome-icon-theme-1.2
-	dev-libs/atk
-	>=gnome-extra/libgtkhtml-3.7
-	>=dev-libs/glib-2
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/evolution-data-server-1.3.1
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-base/gnome-vfs-2.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=net-libs/libsoup-2.2
-	>=gnome-base/libgnome-2
-	>=x11-libs/pango-1.8.1
-	mail-filter/spamassassin
-	pda? (
-		>=app-pda/gnome-pilot-2
-		>=app-pda/gnome-pilot-conduits-2 )
-	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? (
-		mozilla? ( www-client/mozilla )
-		!mozilla? (
-			>=dev-libs/nspr-4.4.1
-			>=dev-libs/nss-3.9.2 ) )
-	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )
-	krb4? ( virtual/krb5 )
-	gstreamer? (
-		=media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8* )
-	dbus? ( sys-apps/dbus )
-	mono? ( >=dev-lang/mono-1 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.30
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-
-pkg_setup() {
-	G2CONF="--disable-default-binary --without-kde-applnk-path \
-		$(use_enable static) $(use_enable ssl nss) $(use_enable ssl smime) \
-		$(use_enable ipv6) $(use_enable mono) $(use_enable nntp)           \
-		$(use_enable pda pilot-conduits) $(use_with ldap openldap)         \
-		$(use_with kerberos krb5 /usr)"
-
-	use ldap && G2CONF="${G2CONF} $(use_with static static-ldap)"
-
-	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
-
-	# 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
-	# SSL support has almost entirely moved to e-d-s,
-	# keep an eye on it in rev-bumps (HAVE_SSL)
-	# <obz@gentoo.org>
-
-	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
-
-		G2CONF="${G2CONF} --enable-nss=yes \
-			--with-nspr-includes=${NSPR_INC} \
-			--with-nspr-libs=${NSPR_LIB} \
-			--with-nss-includes=${NSS_INC} \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# Plug-ins to install. Normally we would want something similar to
-	# --enable-plugins=all (plugins_base + plugins_standard), except for some
-	# special cases.
-	local plugins="calendar-file calendar-http calendar-weather \
-		itip-formatter plugin-manager default-source addressbook-file \
-		startup-wizard print-message mark-all-read groupwise-features \
-		groupwise-account-setup mail-account-disable sa-junk-plugin   \
-		bbdb subject-thread save-calendar select-one-source copy-tool \
-		mail-to-task mark-calendar-offline mailing-list-actions       \
-		default-mailer"
-
-	# The special cases
-	use gstreamer && plugins="${plugins} audio-inline"
-	use dbus && plugins="${plugins} new-mail-notify"
-	use mono && plugins="${plugins} mono"
-	# 'exchange-operations' missing for now
-
-	local pluginlist=""
-	for p in $plugins; do
-		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
-		pluginlist="${pluginlist}${p}"
-	done
-
-	G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	gnome2_omf_fix help/omf.make help/C/Makefile.in
-
-	# Accept the list of plugins separated by commas instead of spaces.
-	epatch ${FILESDIR}/${PN}-2.3.7-configure_plugins.patch
-	# Fix for linking problems, #85013 and #92682
-	epatch ${FILESDIR}/${PN}-2.2.3-linking-fix.patch
-
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-
-	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
-
-	alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
diff --git a/mail-client/evolution/files/digest-evolution-2.3.7-r1 b/mail-client/evolution/files/digest-evolution-2.3.7-r1
deleted file mode 100644
index 0cb35a32d672..000000000000
--- a/mail-client/evolution/files/digest-evolution-2.3.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12d29f28f8ecf302547c63ad137e0b4b evolution-2.3.7.tar.bz2 11311740
diff --git a/mail-client/evolution/files/digest-evolution-2.3.8 b/mail-client/evolution/files/digest-evolution-2.3.8-r1
index 25d33ffb870c..25d33ffb870c 100644
--- a/mail-client/evolution/files/digest-evolution-2.3.8
+++ b/mail-client/evolution/files/digest-evolution-2.3.8-r1
diff --git a/mail-client/evolution/files/evolution-2.3.8-gentoo.patch b/mail-client/evolution/files/evolution-2.3.8-gentoo.patch
new file mode 100644
index 000000000000..15f9ef8bb3ff
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.3.8-gentoo.patch
@@ -0,0 +1,11 @@
+diff -NurdB evolution-2.3.8/widgets/misc/e-canvas-background.c evolution-2.3.8-patched/widgets/misc/e-canvas-background.c
+--- evolution-2.3.8/widgets/misc/e-canvas-background.c	2005-08-22 05:52:55.000000000 -0500
++++ evolution-2.3.8-patched/widgets/misc/e-canvas-background.c	2005-09-01 23:13:54.000000000 -0500
+@@ -427,6 +427,7 @@
+ ecb_style_set (ECanvasBackground *ecb, GtkStyle *previous_style)
+ {
+ 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ecb);
++	g_return_if_fail (ecb->priv->gc != NULL);
+ 	gdk_gc_set_foreground (ecb->priv->gc, &GTK_WIDGET(item->canvas)->style->base[GTK_STATE_NORMAL]);
+ 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb));
+ }