Update to 1.5.90.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2442 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 48 insertions, 188 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8bdab56e7..f3e62cc5f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	1.5.9.2
+PORTVERSION=	1.5.90
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.5
@@ -35,7 +35,6 @@ CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-sub-version="FreeBSD GNOME Team Port" \
 		--with-krb5=/usr
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 EVO_VERSION=	1.5
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index ad958d33f..d6e1aac3a 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-1.5.9.2.tar.bz2) = 3aa5a9f7c390a6b164906fa83ed31605
-SIZE (gnome2/evolution-1.5.9.2.tar.bz2) = 11774464
+MD5 (gnome2/evolution-1.5.90.tar.bz2) = c33c6a84de4049202cd72dea934a3240
+SIZE (gnome2/evolution-1.5.90.tar.bz2) = 12239132
diff --git a/mail/evolution/files/patch-addressbook_gui_contact-list-editor_e-contact-list-editor.c b/mail/evolution/files/patch-addressbook_gui_contact-list-editor_e-contact-list-editor.c
new file mode 100644
index 000000000..285494765
--- /dev/null
+++ b/mail/evolution/files/patch-addressbook_gui_contact-list-editor_e-contact-list-editor.c
@@ -0,0 +1,20 @@
+--- addressbook/gui/contact-list-editor/e-contact-list-editor.c.orig	Mon Jul  5 18:18:22 2004
++++ addressbook/gui/contact-list-editor/e-contact-list-editor.c	Mon Jul  5 18:18:59 2004
+@@ -666,11 +666,15 @@
+ 
+ 	EContactListEditor *ce;
+ 
++	Bonobo_Control corba_control;
++
++	GtkWidget *control_widget;
++
+ 	ce = E_CONTACT_LIST_EDITOR (data);
+ 
+-	Bonobo_Control corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection
++	corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection
+ 			(ce->corba_select_names, "Members", ev);
+-	GtkWidget *control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
++	control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
+ 
+ 	bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations",
+ 					    TC_CORBA_string, &string, NULL);
diff --git a/mail/evolution/files/patch-calendar_gui_e-tasks.c b/mail/evolution/files/patch-calendar_gui_e-tasks.c
deleted file mode 100644
index 8125925cb..000000000
--- a/mail/evolution/files/patch-calendar_gui_e-tasks.c
+++ /dev/null
@@ -1,32 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v
-retrieving revision 1.95
-retrieving revision 1.96
-diff -u -r1.95 -r1.96
---- calendar/gui/e-tasks.c	2004/06/02 09:33:36	1.95
-+++ calendar/gui/e-tasks.c	2004/06/03 17:54:24	1.96
-@@ -679,15 +679,18 @@
- {
- 	ETasksPrivate *priv;
- 	va_list args;
--	char sz[2048];
--	
--	va_start (args, message);
--	vsnprintf (sz, sizeof sz, message, args);
--	va_end (args);
-+	char sz[2048], *msg_string = NULL;
-+
-+	if (message) {
-+		va_start (args, message);
-+		vsnprintf (sz, sizeof sz, message, args);
-+		va_end (args);
-+		msg_string = sz;
-+	}
- 
- 	priv = tasks->priv;
- 	
--	e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->tasks_view), sz);
-+	e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->tasks_view), msg_string);
- }
- 
- /* Callback from the calendar client when an error occurs in the backend */
diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh
index 8c8acdd88..eba422a4f 100644
--- a/mail/evolution/files/patch-ltmain.sh
+++ b/mail/evolution/files/patch-ltmain.sh
@@ -1,14 +1,5 @@
 --- ltmain.sh.orig	Fri Mar  5 10:05:44 2004
-+++ ltmain.sh	Sat Mar  6 04:33:50 2004
-@@ -1349,7 +1349,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
++++ ltmain.sh	Mon Jul  5 17:36:23 2004
 @@ -1364,8 +1364,16 @@
  	continue
  	;;
@@ -26,7 +17,15 @@
  	continue
  	;;
  
-@@ -3059,6 +3067,9 @@
+@@ -1849,6 +1857,7 @@
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+ 	  else
+ 	    deplibs="$deplib $deplibs"
++	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	  fi
+ 	  continue
+ 	  ;;
+@@ -3059,6 +3068,9 @@
  	    # problems, so we reset it completely
  	    verstring=
  	    ;;
@@ -36,7 +35,7 @@
  	  *)
  	    verstring="0.0"
  	    ;;
-@@ -5531,10 +5542,12 @@
+@@ -5531,10 +5543,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index af3f65795..74d5d2346 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,73 +1,16 @@
 bin/evolution-%%VERSION%%
-bin/evolution-addressbook-export
-etc/gconf/gconf.xml.defaults/apps/evolution/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/select_names/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/date_navigator/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/publish/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/format/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/sa/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/message_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/subscribe_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/offline/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/folder_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/completion/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/select_names/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/date_navigator/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/publish/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/sa/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/message_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/subscribe_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/offline/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/folder_bar/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_addressbook-%%VERSION%%.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_evolution_addressbook-%%VERSION%%.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_addressbook-%%VERSION%%.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_calendar-%%VERSION%%.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_evolution_calendar-%%VERSION%%.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_calendar-%%VERSION%%.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_shell-%%VERSION%%.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_evolution_shell-%%VERSION%%.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_shell-%%VERSION%%.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/evolution-mail-%%VERSION%%.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/evolution-mail-%%VERSION%%.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/evolution-mail-%%VERSION%%.schemas > /dev/null || /usr/bin/true
 include/evolution-%%VERSION%%/camel/broken-date-parser.h
 include/evolution-%%VERSION%%/camel/camel-address.h
 include/evolution-%%VERSION%%/camel/camel-arg.h
@@ -345,6 +288,7 @@ libexec/evolution/%%VERSION%%/camel/camel-index-control
 libexec/evolution/%%VERSION%%/camel/camel-lock-helper
 libexec/evolution/%%VERSION%%/csv2vcard
 libexec/evolution/%%VERSION%%/evolution-addressbook-clean
+libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/killev
 share/gnome/applications/evolution-%%VERSION%%.desktop
@@ -367,12 +311,11 @@ share/gnome/evolution/%%VERSION%%/etspec/e-contact-list-editor.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-meeting-time-sel.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-select-names-section.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-select-names.etspec
-share/gnome/evolution/%%VERSION%%/etspec/e-storage-set-view.etspec
 share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec
 share/gnome/evolution/%%VERSION%%/filtertypes.xml
+share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/alarm-list-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade
-share/gnome/evolution/%%VERSION%%/glade/alarm-options.glade
-share/gnome/evolution/%%VERSION%%/glade/alarm-page.glade
 share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/calendar-setup.glade
 share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade
@@ -380,12 +323,8 @@ share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade
 share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/e-contact-print.glade
 share/gnome/evolution/%%VERSION%%/glade/e-delegate-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-folder-list.glade
 share/gnome/evolution/%%VERSION%%/glade/e-itip-control.glade
 share/gnome/evolution/%%VERSION%%/glade/e-msg-composer-attachment.glade
-share/gnome/evolution/%%VERSION%%/glade/e-shell-config-default-folders.glade
-share/gnome/evolution/%%VERSION%%/glade/e-shell-folder-creation-dialog.glade
-share/gnome/evolution/%%VERSION%%/glade/e-shell-shared-folder-picker-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/e-timezone-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade
 share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade
@@ -399,15 +338,12 @@ share/gnome/evolution/%%VERSION%%/glade/im.glade
 share/gnome/evolution/%%VERSION%%/glade/import.glade
 share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
-share/gnome/evolution/%%VERSION%%/glade/mail-search.glade
-share/gnome/evolution/%%VERSION%%/glade/mail-security.glade
+share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
 share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
-share/gnome/evolution/%%VERSION%%/glade/message-tags.glade
 share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade
 share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade
 share/gnome/evolution/%%VERSION%%/glade/select-names.glade
 share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
-share/gnome/evolution/%%VERSION%%/glade/subscribe-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
 share/gnome/evolution/%%VERSION%%/glade/task-page.glade
 share/gnome/evolution/%%VERSION%%/glade/url-editor-dialog.glade
@@ -520,6 +456,7 @@ share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/evolution-%%VERSION%%.png
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -566,6 +503,7 @@ share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/omf/evolution
@@ -609,68 +547,4 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm include/evolution-%%VERSION%%/e-conduit
 @dirrm include/evolution-%%VERSION%%/camel
 @dirrm include/evolution-%%VERSION%%
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/folder_bar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/offline
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/subscribe_window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/message_window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/sa
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/publish
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/notify
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/date_navigator
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/select_names
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/completion
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/folder_bar
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/offline
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/subscribe_window
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/message_window
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/sa
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/format
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/display
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/view
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/publish
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/notify
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/display
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/date_navigator
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/select_names
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/display
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true