Moving to mail-client/evolution

9 files changed, 0 insertions, 777 deletions

diff --git a/net-mail/evolution/files/digest-evolution-1.2.4 b/net-mail/evolution/files/digest-evolution-1.2.4
deleted file mode 100644
index b3cec260c9c4..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.2.4
+++ /dev/null
@@ -1,16 +0,0 @@
-MD5 dc3bc6e2c133bb380f48f50f4918052e /files/evolution-1.0.2-conduit.patch 308
-MD5 76b7ec4d297cc9e14fd0c348c8449b75 /files/evolution-1.0.2-imapfix.diff 2838
-MD5 53050cb008a2555b215f7401772cfede /files/evolution-1.0.2-kde.patch 656
-MD5 d6c7be2ddd045fb5d487416bd09f1c1b /files/evolution-1.0.3-filter-crash.patch 1202
-MD5 1a2892e6ac519f18f30f5e2aa6508174 /files/evolution-1.0.8-mark-read-crash.patch 2018
-MD5 ecec58337e9c9f9ffb1013c4860fd33c /files/evolution-1.0.8-scrollkeeper.patch 1492
-MD5 c837abd50d990dea46fcea32b8a1b001 /files/evolution-1.1.90-kde.patch 689
-MD5 d2dcad91e6ec97286468eb7d13ceac9b /files/evolution-1.1.90-scrollkeeper.patch 1365
-MD5 8909b7f2d3483d55036f21ca2780e4a3 /files/evolution-1.1.90-sharedldap.patch 370
-MD5 f44bc5e363c1f976a7a72676886b9d13 /files/evolution-1.1.90-subversion.patch 470
-MD5 63d02821e6de8e0129d954d406dc77ae /files/evolution-1.1.90-utf8.patch 726
-MD5 2526fb78fe27dc17b78566860285bff1 /files/evolution-1.2.0-settingscrash.patch 625
-MD5 980771bb5349699c8d8ecd6b6f035b50 /files/gnome-pilot.m4 6452
-MD5 eb3c88124e9daf30ee0f70e4e10ea53d /evolution-1.2.4.ebuild 6239
-MD5 2c525e0d0e570c96e4fb1fd95e46354c evolution-1.2.4.tar.gz 16673251
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.4.5 b/net-mail/evolution/files/digest-evolution-1.4.5
deleted file mode 100644
index 9b6429c969e8..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.4.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f16a86d6eaa9d9683f215586fcdac374 evolution-1.4.5.tar.bz2 13641682
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.4.6 b/net-mail/evolution/files/digest-evolution-1.4.6
deleted file mode 100644
index bba598d859f0..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.4.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4138610c027177e6ffe92bdd565128a6 evolution-1.4.6.tar.bz2 13927597
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/evolution-1.1.90-kde.patch b/net-mail/evolution/files/evolution-1.1.90-kde.patch
deleted file mode 100644
index af178f1210f5..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-kde.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- evolution-1.1.90/configure.in.kde	2002-11-07 13:07:41.000000000 +0100
-+++ evolution-1.1.90/configure.in	2002-11-07 13:12:12.000000000 +0100
-@@ -1196,18 +1196,8 @@
- 	if test -z "$with_kde_applnk_path"; then
- 		with_kde_applnk_path="$prefix/share/applnk"
- 	fi
--	if test -d "$with_kde_applnk_path" ; then
--		AC_DEFINE(HAVE_KDE_APPLNK)
--		KDE_APPLNK_DIR="$with_kde_applnk_path"
--	else
--		AC_PATH_PROG(KDECONFIG, kde-config)
--		if test -n "$KDECONFIG"; then
--			KDE_APPLNK_DIR=`$KDECONFIG --expandvars --install apps`
--			AC_DEFINE(HAVE_KDE_APPLNK)
--		else
--			KDE_APPLNK_DIR=""
--		fi
--	fi
-+	AC_DEFINE(HAVE_KDE_APPLNK)
-+	KDE_APPLNK_DIR="$with_kde_applnk_path"
- else
- 	KDE_APPLNK_DIR=""
- fi
diff --git a/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch b/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch
deleted file mode 100644
index 6784aa343848..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-sharedldap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- evolution-1.1.90/acinclude.m4.orig	2002-09-04 22:28:05.000000000 +0200
-+++ evolution-1.1.90/acinclude.m4	2002-11-07 14:03:12.000000000 +0100
-@@ -107,7 +107,7 @@
- 
- 		case $with_static_ldap in
- 		no|"")
--			if test -f $with_openldap/lib/libldap.la; then
-+			if test ! -f $with_openldap/lib/libldap.la; then
- 				with_static_ldap=yes
- 			else
- 				with_static_ldap=no
diff --git a/net-mail/evolution/files/evolution-1.1.90-subversion.patch b/net-mail/evolution/files/evolution-1.1.90-subversion.patch
deleted file mode 100644
index 83cb40fd71b0..000000000000
--- a/net-mail/evolution/files/evolution-1.1.90-subversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- evolution-1.1.90/mail/mail-ops.c.subversion	2002-09-24 19:45:37.000000000 +0200
-+++ evolution-1.1.90/mail/mail-ops.c	2002-11-07 13:17:20.000000000 +0100
-@@ -467,7 +467,7 @@
- 	int i;
- 	
- 	camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer",
--				 "Ximian Evolution " VERSION SUB_VERSION " " VERSION_COMMENT);
-+				 "Ximian Evolution " VERSION "-" SUB_VERSION " " VERSION_COMMENT);
- 	
- 	camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
- 	
diff --git a/net-mail/evolution/files/evolution-1.4.4-alpha.patch b/net-mail/evolution/files/evolution-1.4.4-alpha.patch
deleted file mode 100644
index 7fbf8f648b09..000000000000
--- a/net-mail/evolution/files/evolution-1.4.4-alpha.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- evolution-1.4.4/filter/rule-context.c	2003-06-12 13:04:20.000000000 -0400
-+++ ../../evo-avg/filter/rule-context.c	2003-08-18 14:29:14.000000000 -0400
-@@ -209,7 +209,7 @@
- }
- 
- void
--rule_context_add_part_set(RuleContext *rc, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next)
-+rule_context_add_part_set(RuleContext *rc, const char *setname, GType part_type, RCPartFunc append, RCNextPartFunc next)
- {
- 	struct _part_set_map *map;
- 	
-@@ -226,7 +226,7 @@
- }
- 
- void
--rule_context_add_rule_set(RuleContext *rc, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next)
-+rule_context_add_rule_set(RuleContext *rc, const char *setname, GType rule_type, RCRuleFunc append, RCNextRuleFunc next)
- {
- 	struct _rule_set_map *map;
- 	
---- evolution-1.4.4/filter/rule-context.h	2003-04-29 14:14:08.000000000 -0400
-+++ ../../evo-avg/filter/rule-context.h	2003-08-18 14:28:04.000000000 -0400
-@@ -85,14 +85,14 @@
- 
- struct _part_set_map {
- 	char *name;
--	int type;
-+	GType type;
- 	RCPartFunc append;
- 	RCNextPartFunc next;
- };
- 
- struct _rule_set_map {
- 	char *name;
--	int type;
-+	GType type;
- 	RCRuleFunc append;
- 	RCNextRuleFunc next;
- };
-@@ -122,9 +122,9 @@
- int rule_context_get_rank_rule (RuleContext *rc, FilterRule *rule, const char *source);
- 
- /* setup type for set parts */
--void rule_context_add_part_set (RuleContext *rc, const char *setname, int part_type,
-+void rule_context_add_part_set (RuleContext *rc, const char *setname, GType part_type,
- 				RCPartFunc append, RCNextPartFunc next);
--void rule_context_add_rule_set (RuleContext *rc, const char *setname, int rule_type,
-+void rule_context_add_rule_set (RuleContext *rc, const char *setname, GType rule_type,
- 				RCRuleFunc append, RCNextRuleFunc next);
- 
- /* uri's disappear/renamed externally */
diff --git a/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch b/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch
deleted file mode 100644
index 034c466578a0..000000000000
--- a/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch
+++ /dev/null
@@ -1,608 +0,0 @@
-diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am evolution-1.4.5/addressbook/backend/ebook/Makefile.am
---- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/ebook/Makefile.am	2004-04-28 13:14:03.000000000 +0000
-@@ -45,8 +45,6 @@
- 	-I$(top_builddir)/addressbook/ename		\
- 	-I$(top_builddir)/shell				\
- 	-I$(top_srcdir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- privlib_LTLIBRARIES = libebook.la libebook-static.la
-diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in evolution-1.4.5/addressbook/backend/ebook/Makefile.in
---- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/ebook/Makefile.in	2004-04-28 13:13:57.000000000 +0000
-@@ -263,8 +263,6 @@
- 	-I$(top_builddir)/addressbook/ename		\
- 	-I$(top_builddir)/shell				\
- 	-I$(top_srcdir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am evolution-1.4.5/addressbook/backend/pas/Makefile.am
---- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/pas/Makefile.am	2004-04-28 13:14:10.000000000 +0000
-@@ -23,8 +23,6 @@
- 	-I$(top_srcdir) 				\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- LDAP_SCHEMA =						\
-diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in evolution-1.4.5/addressbook/backend/pas/Makefile.in
---- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/pas/Makefile.in	2004-04-28 13:14:15.000000000 +0000
-@@ -239,8 +239,6 @@
- 	-I$(top_srcdir) 				\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.am evolution-1.4.5/addressbook/gui/component/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/component/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/Makefile.am	2004-04-28 13:16:39.000000000 +0000
-@@ -21,10 +21,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
- 	-DPREFIX=\""$(prefix)"\"				\
- 	$(LDAP_CFLAGS)						\
--	-DG_DISABLE_DEPRECATED					\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED				\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED				\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- component_LTLIBRARIES = libevolution-addressbook.la
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.in evolution-1.4.5/addressbook/gui/component/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/component/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/Makefile.in	2004-04-28 13:16:44.000000000 +0000
-@@ -241,10 +241,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
- 	-DPREFIX=\""$(prefix)"\"				\
- 	$(LDAP_CFLAGS)						\
--	-DG_DISABLE_DEPRECATED					\
--	-DGTK_DISABLE_DEPRECATED				\
--	-DLIBGNOME_DISABLE_DEPRECATED				\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED				\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am	2004-04-28 13:16:22.000000000 +0000
-@@ -43,10 +43,6 @@
- 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"	\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES = libeselectnames.la
-diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in	2004-04-28 13:16:28.000000000 +0000
-@@ -258,10 +258,6 @@
- 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"	\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am	2004-04-28 13:16:07.000000000 +0000
-@@ -12,10 +12,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in	2004-04-28 13:16:01.000000000 +0000
-@@ -232,10 +232,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am	2004-04-28 13:15:40.000000000 +0000
-@@ -13,10 +13,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in	2004-04-28 13:15:34.000000000 +0000
-@@ -233,10 +233,6 @@
- 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\""	\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am evolution-1.4.5/addressbook/gui/merging/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/merging/Makefile.am	2004-04-28 13:15:19.000000000 +0000
-@@ -4,10 +4,6 @@
- 	-I$(top_srcdir)					\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in evolution-1.4.5/addressbook/gui/merging/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/merging/Makefile.in	2004-04-28 13:15:13.000000000 +0000
-@@ -224,10 +224,6 @@
- 	-I$(top_srcdir)					\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.am evolution-1.4.5/addressbook/gui/search/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/search/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/search/Makefile.am	2004-04-28 13:14:59.000000000 +0000
-@@ -13,10 +13,6 @@
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
- 	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.in evolution-1.4.5/addressbook/gui/search/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/search/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/search/Makefile.in	2004-04-28 13:15:04.000000000 +0000
-@@ -233,10 +233,6 @@
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
- 	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am evolution-1.4.5/addressbook/gui/widgets/Makefile.am
---- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/widgets/Makefile.am	2004-04-28 13:14:41.000000000 +0000
-@@ -11,10 +11,6 @@
- 	-I$(top_srcdir)/addressbook/gui/component	\
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- CORBA_COMPOSER_SOURCE_H	=			\
-diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in evolution-1.4.5/addressbook/gui/widgets/Makefile.in
---- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/gui/widgets/Makefile.in	2004-04-28 13:14:48.000000000 +0000
-@@ -231,10 +231,6 @@
- 	-I$(top_srcdir)/addressbook/gui/component	\
- 	-I$(top_srcdir)/widgets/misc			\
- 	-I$(top_builddir)/shell				\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DLIBGNOME_DISABLE_DEPRECATED			\
--	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
- 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.am evolution-1.4.5/addressbook/tools/Makefile.am
---- evolution-1.4.5.orig/addressbook/tools/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/tools/Makefile.am	2004-04-28 13:13:21.000000000 +0000
-@@ -13,7 +13,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- evolution_addressbook_export_SOURCES =				\
-diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.in evolution-1.4.5/addressbook/tools/Makefile.in
---- evolution-1.4.5.orig/addressbook/tools/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/tools/Makefile.in	2004-04-28 13:13:25.000000000 +0000
-@@ -234,7 +234,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/camel/Makefile.am evolution-1.4.5/camel/Makefile.am
---- evolution-1.4.5.orig/camel/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/Makefile.am	2004-04-28 13:12:56.000000000 +0000
-@@ -16,7 +16,6 @@
- 	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
- 	-DG_LOG_DOMAIN=\"camel\"			\
--	-DG_DISABLE_DEPRECATED				\
- 	$(CAMEL_CFLAGS)
- 
- libcamel_la_SOURCES = 				\
-diff -uNr evolution-1.4.5.orig/camel/Makefile.in evolution-1.4.5/camel/Makefile.in
---- evolution-1.4.5.orig/camel/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/Makefile.in	2004-04-28 13:12:50.000000000 +0000
-@@ -235,7 +235,6 @@
- 	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
- 	-DG_LOG_DOMAIN=\"camel\"			\
--	-DG_DISABLE_DEPRECATED				\
- 	$(CAMEL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.am evolution-1.4.5/camel/providers/imap/Makefile.am
---- evolution-1.4.5.orig/camel/providers/imap/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/imap/Makefile.am	2004-04-28 13:11:20.000000000 +0000
-@@ -14,8 +14,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-imap-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-imap-provider\"
- 
- libcamelimap_la_SOURCES = 			\
- 	camel-imap-command.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.in evolution-1.4.5/camel/providers/imap/Makefile.in
---- evolution-1.4.5.orig/camel/providers/imap/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/imap/Makefile.in	2004-04-28 13:11:14.000000000 +0000
-@@ -233,8 +233,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-imap-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-imap-provider\"
- 
- 
- libcamelimap_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.am evolution-1.4.5/camel/providers/local/Makefile.am
---- evolution-1.4.5.orig/camel/providers/local/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/local/Makefile.am	2004-04-28 13:10:32.000000000 +0000
-@@ -14,8 +14,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-local-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-local-provider\"	
- 
- libcamellocal_la_SOURCES = 			\
- 	camel-local-folder.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.in evolution-1.4.5/camel/providers/local/Makefile.in
---- evolution-1.4.5.orig/camel/providers/local/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/local/Makefile.in	2004-04-28 13:10:40.000000000 +0000
-@@ -233,8 +233,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-local-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-local-provider\"
- 
- 
- libcamellocal_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.am evolution-1.4.5/camel/providers/nntp/Makefile.am
---- evolution-1.4.5.orig/camel/providers/nntp/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/nntp/Makefile.am	2004-04-28 13:10:55.000000000 +0000
-@@ -13,8 +13,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-nntp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
- 
- libcamelnntp_la_SOURCES = 			\
- 	camel-nntp-provider.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.in evolution-1.4.5/camel/providers/nntp/Makefile.in
---- evolution-1.4.5.orig/camel/providers/nntp/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/nntp/Makefile.in	2004-04-28 13:11:01.000000000 +0000
-@@ -232,8 +232,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-nntp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
- 
- 
- libcamelnntp_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.am evolution-1.4.5/camel/providers/pop3/Makefile.am
---- evolution-1.4.5.orig/camel/providers/pop3/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/pop3/Makefile.am	2004-04-28 13:12:30.000000000 +0000
-@@ -15,8 +15,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-pop3-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
- 
- libcamelpop3_la_SOURCES = 			\
- 	camel-pop3-engine.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.in evolution-1.4.5/camel/providers/pop3/Makefile.in
---- evolution-1.4.5.orig/camel/providers/pop3/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/pop3/Makefile.in	2004-04-28 13:12:37.000000000 +0000
-@@ -234,8 +234,7 @@
- 	$(CAMEL_CFLAGS)				\
- 	$(GNOME_INCLUDEDIR)			\
- 	$(GTK_INCLUDEDIR)			\
--	-DG_LOG_DOMAIN=\"camel-pop3-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
- 
- 
- libcamelpop3_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am evolution-1.4.5/camel/providers/sendmail/Makefile.am
---- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/sendmail/Makefile.am	2004-04-28 13:12:07.000000000 +0000
-@@ -14,8 +14,7 @@
- 	$(CAMEL_CFLAGS)					\
- 	$(GNOME_INCLUDEDIR)				\
- 	$(GTK_INCLUDEDIR) 				\
--	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"
- 
- libcamelsendmail_la_SOURCES = 			\
- 	camel-sendmail-provider.c		\
-diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in evolution-1.4.5/camel/providers/sendmail/Makefile.in
---- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/sendmail/Makefile.in	2004-04-28 13:11:57.000000000 +0000
-@@ -233,8 +233,7 @@
- 	$(CAMEL_CFLAGS)					\
- 	$(GNOME_INCLUDEDIR)				\
- 	$(GTK_INCLUDEDIR) 				\
--	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"
- 
- 
- libcamelsendmail_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.am evolution-1.4.5/camel/providers/smtp/Makefile.am
---- evolution-1.4.5.orig/camel/providers/smtp/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/smtp/Makefile.am	2004-04-28 13:11:44.000000000 +0000
-@@ -18,8 +18,7 @@
- 	$(NSPR_CFLAGS)				\
- 	$(NSS_CFLAGS)				\
- 	$(OPENSSL_CFLAGS)			\
--	-DG_LOG_DOMAIN=\"camel-smtp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
- 
- libcamelsmtp_la_SOURCES = 			\
- 	camel-smtp-provider.c			\
-diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.in evolution-1.4.5/camel/providers/smtp/Makefile.in
---- evolution-1.4.5.orig/camel/providers/smtp/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/camel/providers/smtp/Makefile.in	2004-04-28 13:11:37.000000000 +0000
-@@ -237,8 +237,7 @@
- 	$(NSPR_CFLAGS)				\
- 	$(NSS_CFLAGS)				\
- 	$(OPENSSL_CFLAGS)			\
--	-DG_LOG_DOMAIN=\"camel-smtp-provider\"	\
--	-DG_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
- 
- 
- libcamelsmtp_la_SOURCES = \
-diff -uNr evolution-1.4.5.orig/composer/Makefile.am evolution-1.4.5/composer/Makefile.am
---- evolution-1.4.5.orig/composer/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/composer/Makefile.am	2004-04-28 13:10:08.000000000 +0000
-@@ -54,8 +54,6 @@
- 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
- 	-DPREFIX=\"$(prefix)\"						\
- 	-DG_LOG_DOMAIN=\"composer\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(EVOLUTION_MAIL_CFLAGS)
- 
- libcomposer_la_SOURCES = 			\
-diff -uNr evolution-1.4.5.orig/composer/Makefile.in evolution-1.4.5/composer/Makefile.in
---- evolution-1.4.5.orig/composer/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/composer/Makefile.in	2004-04-28 13:10:00.000000000 +0000
-@@ -266,8 +266,6 @@
- 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
- 	-DPREFIX=\"$(prefix)\"						\
- 	-DG_LOG_DOMAIN=\"composer\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(EVOLUTION_MAIL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/e-util/Makefile.am evolution-1.4.5/e-util/Makefile.am
---- evolution-1.4.5.orig/e-util/Makefile.am	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/e-util/Makefile.am	2004-04-28 13:09:47.000000000 +0000
-@@ -9,8 +9,6 @@
- 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
- 	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\
- 	-DG_LOG_DOMAIN=\"e-utils\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(DB3_CFLAGS)							\
- 	$(GNOME_PILOT_CFLAGS)						\
- 	$(E_UTIL_CFLAGS)
-diff -uNr evolution-1.4.5.orig/e-util/Makefile.in evolution-1.4.5/e-util/Makefile.in
---- evolution-1.4.5.orig/e-util/Makefile.in	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/e-util/Makefile.in	2004-04-28 13:09:42.000000000 +0000
-@@ -229,8 +229,6 @@
- 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
- 	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\
- 	-DG_LOG_DOMAIN=\"e-utils\"					\
--	-DG_DISABLE_DEPRECATED						\
--	-DGTK_DISABLE_DEPRECATED					\
- 	$(DB3_CFLAGS)							\
- 	$(GNOME_PILOT_CFLAGS)						\
- 	$(E_UTIL_CFLAGS)
-diff -uNr evolution-1.4.5.orig/filter/Makefile.am evolution-1.4.5/filter/Makefile.am
---- evolution-1.4.5.orig/filter/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/filter/Makefile.am	2004-04-28 13:09:28.000000000 +0000
-@@ -8,8 +8,6 @@
- 	-I $(top_srcdir)/shell			\
- 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
- 	-DG_LOG_DOMAIN=\"filter\"		\
--	-DG_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED		\
- 	$(LIBFILTER_CFLAGS)
- 
- noinst_LTLIBRARIES =				\
-diff -uNr evolution-1.4.5.orig/filter/Makefile.in evolution-1.4.5/filter/Makefile.in
---- evolution-1.4.5.orig/filter/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/filter/Makefile.in	2004-04-28 13:09:23.000000000 +0000
-@@ -228,8 +228,6 @@
- 	-I $(top_srcdir)/shell			\
- 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
- 	-DG_LOG_DOMAIN=\"filter\"		\
--	-DG_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED		\
- 	$(LIBFILTER_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/mail/Makefile.am evolution-1.4.5/mail/Makefile.am
---- evolution-1.4.5.orig/mail/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/mail/Makefile.am	2004-04-28 13:08:59.000000000 +0000
-@@ -34,8 +34,6 @@
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
- 	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"			\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
- 	-DG_LOG_DOMAIN=\"evolution-mail\"
- 
- component_LTLIBRARIES = libevolution-mail.la
-diff -uNr evolution-1.4.5.orig/mail/Makefile.in evolution-1.4.5/mail/Makefile.in
---- evolution-1.4.5.orig/mail/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/mail/Makefile.in	2004-04-28 13:08:54.000000000 +0000
-@@ -254,8 +254,6 @@
- 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
- 	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\"	\
- 	-DPREFIX=\""$(prefix)"\"			\
--	-DG_DISABLE_DEPRECATED				\
--	-DGTK_DISABLE_DEPRECATED			\
- 	-DG_LOG_DOMAIN=\"evolution-mail\"
- 
- 
-diff -uNr evolution-1.4.5.orig/shell/Makefile.am evolution-1.4.5/shell/Makefile.am
---- evolution-1.4.5.orig/shell/Makefile.am	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/shell/Makefile.am	2004-04-28 13:08:36.000000000 +0000
-@@ -1,8 +1,6 @@
- SUBDIRS = glade importer
- 
- INCLUDES =							\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
--	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED	\
- 	-I$(top_srcdir)/widgets					\
- 	-I$(top_srcdir)/widgets/misc				\
- 	-I$(top_srcdir)/libical/src/libical			\
-diff -uNr evolution-1.4.5.orig/shell/Makefile.in evolution-1.4.5/shell/Makefile.in
---- evolution-1.4.5.orig/shell/Makefile.in	2004-04-28 12:35:54.000000000 +0000
-+++ evolution-1.4.5/shell/Makefile.in	2004-04-28 13:08:32.000000000 +0000
-@@ -221,8 +221,6 @@
- SUBDIRS = glade importer
- 
- INCLUDES = \
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
--	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED	\
- 	-I$(top_srcdir)/widgets					\
- 	-I$(top_srcdir)/widgets/misc				\
- 	-I$(top_srcdir)/libical/src/libical			\
-diff -uNr evolution-1.4.5.orig/tools/Makefile.am evolution-1.4.5/tools/Makefile.am
---- evolution-1.4.5.orig/tools/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/tools/Makefile.am	2004-04-28 13:08:11.000000000 +0000
-@@ -21,7 +21,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- EXTRA_DIST = $(privlibexec_SCRIPTS) verify-evolution-install.sh \
-diff -uNr evolution-1.4.5.orig/tools/Makefile.in evolution-1.4.5/tools/Makefile.in
---- evolution-1.4.5.orig/tools/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/tools/Makefile.in	2004-04-28 13:08:17.000000000 +0000
-@@ -242,7 +242,6 @@
- 	-I$(top_srcdir)/addressbook			\
- 	-I$(top_srcdir)/addressbook/backend		\
- 	-I$(top_builddir)/addressbook/backend		\
--	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED	\
- 	$(GNOME_FULL_CFLAGS)
- 
- 
-diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.am evolution-1.4.5/widgets/misc/Makefile.am
---- evolution-1.4.5.orig/widgets/misc/Makefile.am	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/widgets/misc/Makefile.am	2004-04-28 13:07:48.000000000 +0000
-@@ -6,7 +6,6 @@
- 	-I$(top_srcdir)/widgets/shortcut-bar				\
- 	-DMAP_DIR=\""$(imagesdir)"\"					\
- 	-DG_LOG_DOMAIN=__FILE__						\
--	-DG_DISABLE_DEPRECATED						\
- 	$(GNOME_FULL_CFLAGS)
- 
- privlib_LTLIBRARIES =	\
-diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.in evolution-1.4.5/widgets/misc/Makefile.in
---- evolution-1.4.5.orig/widgets/misc/Makefile.in	2004-04-28 12:35:55.000000000 +0000
-+++ evolution-1.4.5/widgets/misc/Makefile.in	2004-04-28 13:07:58.000000000 +0000
-@@ -227,7 +227,6 @@
- 	-I$(top_srcdir)/widgets/shortcut-bar				\
- 	-DMAP_DIR=\""$(imagesdir)"\"					\
- 	-DG_LOG_DOMAIN=__FILE__						\
--	-DG_DISABLE_DEPRECATED						\
- 	$(GNOME_FULL_CFLAGS)
- 
- 
diff --git a/net-mail/evolution/files/evolution-1.4.5-nztimezone.patch b/net-mail/evolution/files/evolution-1.4.5-nztimezone.patch
deleted file mode 100644
index 452f746ea3bc..000000000000
--- a/net-mail/evolution/files/evolution-1.4.5-nztimezone.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: camel-mime-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-mime-utils.c,v
-retrieving revision 1.183.4.4
-diff -u -r1.183.4.4 camel-mime-utils.c
---- camel-mime-utils.c	26 Sep 2003 16:04:49 -0000	1.183.4.4
-+++ camel-mime-utils.c	8 Oct 2003 16:40:41 -0000
-@@ -3530,12 +3530,12 @@
- 		offset = (*inptr++)=='-'?-1:1;
- 		offset = offset * header_decode_int(&inptr);
- 		d(printf("abs signed offset = %d\n", offset));
--		if (offset < -1200 || offset > 1200)
-+		if (offset < -1200 || offset > 1400)
- 			offset = 0;
- 	} else if (isdigit(*inptr)) {
- 		offset = header_decode_int(&inptr);
- 		d(printf("abs offset = %d\n", offset));
--		if (offset < -1200 || offset > 1200)
-+		if (offset < -1200 || offset > 1400)
- 			offset = 0;
- 	} else {
- 		char *tz = decode_token(&inptr);
-Index: camel-text-index.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-text-index.c,v
-retrieving revision 1.16
-diff -u -r1.16 camel-text-index.c
---- camel-text-index.c	11 Jun 2003 19:38:33 -0000	1.16
-+++ camel-text-index.c	8 Oct 2003 16:40:44 -0000
-@@ -55,6 +55,8 @@
- /* cursor debug */
- #define c(x)
- 
-+#define CAMEL_TEXT_INDEX_MAX_WORDLEN  (60)
-+
- #ifdef ENABLE_THREADS
- #define CAMEL_TEXT_INDEX_LOCK(kf, lock) (e_mutex_lock(((CamelTextIndex *)kf)->priv->lock))
- #define CAMEL_TEXT_INDEX_UNLOCK(kf, lock) (e_mutex_unlock(((CamelTextIndex *)kf)->priv->lock))
-@@ -1478,11 +1480,12 @@
- 			utf8[utf8len] = 0;
- 			g_string_append(p->buffer, utf8);
- 		} else {
--			if (p->buffer->len) {
-+			if (p->buffer->len < CAMEL_TEXT_INDEX_MAX_WORDLEN) {
- 				text_index_name_add_word(idn, p->buffer->str);
- 				/*camel_index_name_add_word(idn, p->buffer->str);*/
--				g_string_truncate(p->buffer, 0);
- 			}
-+			
-+			g_string_truncate (p->buffer, 0);
- 		}
- 	}
-