New revision. Adding patches for bugs #95917, #98491. Adding krb4 support (bug #87022).

(Portage version: 2.0.51.22-r1)

7 files changed, 235 insertions, 25 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 9883dba48ceb..ccbf5f9f8c08 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,18 @@
 # 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.78 2005/07/10 20:52:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.79 2005/07/18 05:07:16 leonardop Exp $
+
+*evolution-2.2.3-r1 (17 Jul 2005)
+
+  17 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  evolution-2.2.3-r1.ebuild, files/evolution-2.2.3-mail_notify.patch,
+  files/evolution-2.2.3-credits.patch,
+  files/evolution-2.2.3-configure_plugins.patch:
+  New revision. Added upstream patch to fix crash when the DBus notification
+  plugin is enabled (bug #95917). Added upstream patch to fix the list of
+  authors in the about dialog (bug #98491). Added support for the 'krb4' USE
+  flag (bug #87022). Added specific control over which plugins are enabled,
+  enforcing better support for the 'gstreamer' and 'dbus' USE flags.
 
   10 Jul 2005; Sven Wegener <swegener@gentoo.org> evolution-1.2.4.ebuild,
   evolution-2.0.3-r2.ebuild, evolution-2.0.4.ebuild,
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 134d94bc3cee..879abcbcdb87 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,30 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7b5d16950ef9b648ce896df7e4a92155 ChangeLog 27051
+MD5 9cf0ee068bb01d1ebf359874a42100b0 ChangeLog 27500
 MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
+MD5 b0509335cff174208ea58b264e858772 evolution-2.2.3-r1.ebuild 5195
+MD5 122ba5634049cbbdeda778eabe6b0f8f .evolution-2.2.3-r1.ebuild.swp 20480
 MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
+MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
 MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
 MD5 2a8ad9a4f1ef4a19c4188cfd749805b1 evolution-2.2.1.1.ebuild 4485
-MD5 90e61a6a94d6988f08f1369c3ce2f193 evolution-2.2.3.ebuild 4139
 MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
+MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
+MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r1 70
 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
-MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
-MD5 5c653e85cdd60291967915b55df80e82 files/digest-evolution-2.2.1.1 72
-MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3 70
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
 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 231c671de5ffec656f15c352abe8dcc4 files/evolution-2.2-mark-as.patch 2283
+MD5 5c653e85cdd60291967915b55df80e82 files/digest-evolution-2.2.1.1 72
 MD5 80037ae3781636f2ddad3a09bf628ebc files/evolution-2.2-pilot.patch 998
-MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
-MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0Yq+I1lqEGTUzyQRAna/AJ9K+kxTekGqS+GgjBBO0Fete7ZNJACfZpxB
-QmJPzyjJfylC+XK9frXNVaY=
-=X/yM
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.2.3.ebuild b/mail-client/evolution/evolution-2.2.3-r1.ebuild
index c48186a11bb8..abd12105a60f 100644
--- a/mail-client/evolution/evolution-2.2.3.ebuild
+++ b/mail-client/evolution/evolution-2.2.3-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.2.3.ebuild,v 1.1 2005/07/08 10:00:54 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.3-r1.ebuild,v 1.1 2005/07/18 05:07:16 leonardop Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="2.0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt dbus debug doc gstreamer ipv6 kerberos ldap mono mozilla nntp pda spell ssl static"
+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
@@ -43,6 +43,7 @@ RDEPEND=">=gnome-extra/libgtkhtml-3.6.2
 			>=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-0.30 )
@@ -60,15 +61,42 @@ USE_DESTDIR="1"
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix potential crash in the DBUS notification plugin. See bug #95917.
+	epatch ${FILESDIR}/${P}-mail_notify.patch
+	# Fix display of credits. See bug #98491.
+	epatch ${FILESDIR}/${P}-credits.patch
+	# Accept the list of plugins separated by commas instead of spaces.
+	epatch ${FILESDIR}/${P}-configure_plugins.patch
+
+	einfo "Running autoconf"
+	autoconf || die "Autoconf failed"
+}
+
 src_compile() {
-	local myconf="--disable-default-binary --enable-plugins=all \
-		--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)"
+	local myconf="--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 && myconf="${myconf} $(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
+		myconf="${myconf} --without-krb4"
+	else
+		myconf="${myconf} $(use_with krb4 krb4 /usr)"
+	fi
+
 	# problems with -O3 on gcc-3.3.1
 	replace-flags -O3 -O2
 
@@ -107,6 +135,29 @@ src_compile() {
 		--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 \
+	groupwise-account-setup itip-formatter plugin-manager send-options \
+	shared-folder groupwise-send-options exchange-account-setup \
+	groupwise-status-tracking default-source addressbook-file \
+	addressbook-groupwise startup-wizard bbdb subject-thread save-attachments \
+	prefer-plain save-calendar select-one-source copy-tool mail-to-task \
+	folder-unsubscribe mark-calendar-offline mailing-list-actions"
+
+	# The special cases
+	use gstreamer && plugins="${plugins} audio-inline"
+	use dbus && plugins="${plugins} new-mail-notify"
+
+	local pluginlist=""
+	for p in $plugins; do
+		[ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
+		pluginlist="${pluginlist}${p}"
+	done
+
+	myconf="${myconf} --enable-plugins=${pluginlist}"
+
 	G2CONF="${G2CONF} ${myconf}"
 
 	gnome2_src_compile
diff --git a/mail-client/evolution/files/digest-evolution-2.2.3 b/mail-client/evolution/files/digest-evolution-2.2.3-r1
index 1991cc8b56f8..1991cc8b56f8 100644
--- a/mail-client/evolution/files/digest-evolution-2.2.3
+++ b/mail-client/evolution/files/digest-evolution-2.2.3-r1
diff --git a/mail-client/evolution/files/evolution-2.2.3-configure_plugins.patch b/mail-client/evolution/files/evolution-2.2.3-configure_plugins.patch
new file mode 100644
index 000000000000..1ab34225f2bd
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.2.3-configure_plugins.patch
@@ -0,0 +1,72 @@
+diff -NurdB evolution-2.2.3/configure.in evolution-2.2.3-patched/configure.in
+--- evolution-2.2.3/configure.in	2005-06-04 05:38:53.000000000 -0500
++++ evolution-2.2.3-patched/configure.in	2005-07-17 07:58:33.000000000 -0500
+@@ -1330,7 +1330,11 @@
+ EVO_PLUGIN_RULE=$srcdir/plugin.mk
+ AC_SUBST_FILE(EVO_PLUGIN_RULE)
+ 
+-AC_ARG_ENABLE(plugins, [  --enable-plugins=[no/base/all/experimental/list]      Enable plugins.],enable_plugins="$enableval",enable_plugins=all)
++AC_ARG_ENABLE(plugins,
++[  --enable-plugins=extension1,extension2,...
++			  build the specified plugins.
++			  You can also use the aliases base, all, and experimental],
++			  enable_plugins="$enableval",enable_plugins=all)
+ 
+ dnl Add any new plugins here
+ plugins_base="calendar-file calendar-http calendar-weather groupwise-account-setup itip-formatter plugin-manager send-options shared-folder groupwise-send-options exchange-account-setup groupwise-status-tracking default-source addressbook-file addressbook-groupwise startup-wizard" 
+@@ -1339,28 +1343,33 @@
+ 
+ plugins_experimental="backup-restore folder-unsubscribe mail-to-meeting"
+ 
+-case x"$enable_plugins" in
+-xno)
+-	plugins_enabled=""
+-	msg_plugins="no (some core functionality will not be available)"
+-	;;
+-xall | x | xyes)
+-	plugins_enabled="$plugins_base $plugins_standard"
+-	msg_plugins="yes (all)"
+-	;;
+-xbase)
+-	plugins_enabled="$plugins_base"
+-	msg_plugins="yes ($plugins_base)"
+-	;;
+-xexperimental)
+-	plugins_enabled="$plugins_base $plugins_standard $plugins_experimental"
+-	msg_plugins="yes ($plugins_base $plugins_standard $plugins_experimental)"
+-	;;
+-*)
+-	plugins_enabled="$enable_plugins"
+-	msg_plugins="yes ($enable_plugins)"
+-	;;
+-esac
++plugins_all="$plugins_base $plugins_standard $plugins_experimental"
++plugins_enabled=""
++
++IFS="${IFS=	}"; evoext_save_ifs="$IFS"; IFS=","
++for plugin in $enable_plugins; do
++ if echo "$plugins_all" | egrep "(^| )$plugin(\$| )" > /dev/null; then
++   plugins_enabled="$plugins_enabled $plugin"
++ elif test "x$plugin" = "xall" || test "x$plugin" = "xyes"; then
++   plugins_enabled="$plugins_enabled $plugins_base $plugins_standard"
++ elif test "x$plugin" = "xbase"; then
++   plugins_enabled="$plugins_enabled $plugins_base"
++ elif test "x$plugin" = "xexperimental"; then
++   plugins_enabled="$plugins_enabled $plugins_all"
++ else
++   AC_MSG_ERROR([the specified plugin $plugin does not exist])
++ fi
++done
++IFS="$evoext_save_ifs"
++
++if test "x$plugins_enabled" = "x"; then
++  msg_plugins="no (some core functionality will not be available)"
++else
++  msg_plugins="yes ($plugins_enabled)"
++fi
++
++plugins_enabled=`echo $plugins_enabled | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
++  
+ AC_SUBST(plugins_enabled)
+ AC_SUBST(plugins_base)
+ AC_SUBST(plugins_standard)
diff --git a/mail-client/evolution/files/evolution-2.2.3-credits.patch b/mail-client/evolution/files/evolution-2.2.3-credits.patch
new file mode 100644
index 000000000000..68ea97c62b6a
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.2.3-credits.patch
@@ -0,0 +1,69 @@
+diff -NurdB evolution-2.2.3/shell/e-shell-window-commands.c evolution-2.2.3-patched/shell/e-shell-window-commands.c
+--- evolution-2.2.3/shell/e-shell-window-commands.c	2005-05-31 20:16:06.000000000 -0500
++++ evolution-2.2.3-patched/shell/e-shell-window-commands.c	2005-07-17 02:55:23.000000000 -0500
+@@ -257,7 +257,7 @@
+ 	"Gregory Leblanc",
+ 	"Gregory McLean",
+ 	"Grzegorz Goawski",
+-	"Gustavo GirÎldez",
++	"Gustavo Gir\xC3\x8E" "ldez",
+ 	"Gustavo Maciel Dias Vieira",
+ 	"H P Nadig",
+ 	"H\xC3\xA9" "ctor Garc\xC3\xAD" "a \xC3\x81" "lvarez",
+@@ -274,7 +274,7 @@
+ 	"Ian Campbell",
+ 	"Ismael Olea",
+ 	"Israel Escalante",
+-	"Iv%Gï¿¿%@n Frade",
++	"Iv\xEF\xBF\xBD" "n Frade",
+ 	"J.H.M. Dassen (Ray)",
+ 	"JP Rosevear",
+ 	"J\xC3\xBC" "rg Billeter",
+@@ -311,11 +311,11 @@
+ 	"Jonas Borgstr",
+ 	"Jonas Borgstr",
+ 	"Jonathan Blandford",
++	"Jonathan Dieter",
+ 	"Jos Dehaes",
+ 	"Jukka Zitting",
+ 	"Julian Missig",
+ 	"Julio M. Merino Vidal",
+-	"JÃ%Gï¿¿%@rg Billeter",
+ 	"Karl Eichwalder",
+ 	"Karsten Br\xC3\xA4" "ckelmann",
+ 	"Kenneth Christiansen",
+@@ -420,7 +420,7 @@
+ 	"Russell Steinthal",
+ 	"Ryan P. Skadberg",
+ 	"S N Tejasvi",
+-	"S.\xc3\x87" "a\xc4\x9" "flar Onur",
++	"S.\xc3\x87" "a\xc4\x9f" "lar Onur",
+ 	"Sam Creasey",
+ 	"Sam\xC3\xBA" "el J\xC3\xB3" "n Gunnarsson",
+ 	"Sankar P",
+@@ -445,7 +445,6 @@
+ 	"Suresh Chandrasekharan",
+ 	"Sushma Rai",
+ 	"Szabolcs Ban",
+-	"T\xC3\xB5" "ivo Leedj\xC3\xA4" "rv",
+ 	"Takayuki KUSANO",
+ 	"Takeshi AIHANA",
+ 	"Tambet Ingo",
+@@ -457,15 +456,15 @@
+ 	"Timo Sirainen",
+ 	"Timothy Lee",
+ 	"Timur Bakeyev",
++	"T\xC3\xB5" "ivo Leedj\xC3\xA4" "rv",
+ 	"Tom Tromey",
+ 	"Tomas Ogren",
+-	"Tomasz KÅoczko",
++	"Tomasz K\xC3\x85" "oczko",
+ 	"Tomislav Vujec",
+ 	"Tony Tsui",
+ 	"Trent Lloyd",
+ 	"Tuomas J. Lukka",
+ 	"Tuomas Kuosmanen",
+-	"Tõivo Leedjärv",
+ 	"Umesh Tiwari",
+ 	"Umeshtej",
+ 	"V Ravi Kumar Raju",
diff --git a/mail-client/evolution/files/evolution-2.2.3-mail_notify.patch b/mail-client/evolution/files/evolution-2.2.3-mail_notify.patch
new file mode 100644
index 000000000000..78cbd71f3b9d
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.2.3-mail_notify.patch
@@ -0,0 +1,13 @@
+diff -NurdB evolution-2.2.3/plugins/new-mail-notify/new-mail-notify.c evolution-2.2.3-patched/plugins/new-mail-notify/new-mail-notify.c
+--- evolution-2.2.3/plugins/new-mail-notify/new-mail-notify.c	2005-04-05 03:13:45.000000000 -0500
++++ evolution-2.2.3-patched/plugins/new-mail-notify/new-mail-notify.c	2005-07-17 00:38:22.000000000 -0500
+@@ -111,6 +111,9 @@
+ 						   DBUS_INTERFACE,
+ 						   message_name);
+ 
++		if (message == NULL)
++			return;
++
+ 		/* Appends the data as an argument to the message */
+ 		dbus_message_append_args (message,
+ #if DBUS_VERSION >= 310