Unbreak and update to 0.8

This one just seems to hang and chew CPU, at least on
my -current laptop.

I fear having to build a separate GNOME environment, with
all the debug symbols, to track this one down.

Two GNOME's on one machine!  He must be mad!

2 files changed, 13 insertions, 40 deletions

diff --git a/mail/evolution-devel/files/patch-ac b/mail/evolution-devel/files/patch-ac
index e106b51197dc..5d909628c78f 100644
--- a/mail/evolution-devel/files/patch-ac
+++ b/mail/evolution-devel/files/patch-ac
@@ -1,23 +1,16 @@
---- camel/providers/imap/Makefile.in.orig	Mon Jul 10 21:34:06 2000
-+++ camel/providers/imap/Makefile.in	Tue Jul 11 19:17:54 2000
-@@ -181,3 +181,3 @@
- 
--libcamelimap_la_LDFLAGS = -version-info 0:0:0
-+libcamelimap_la_LDFLAGS = -avoid-version
- 
---- camel/providers/mbox/Makefile.in.orig	Fri Jun  2 15:48:47 2000
-+++ camel/providers/mbox/Makefile.in	Wed Jun 28 18:54:19 2000
-@@ -167,3 +167,3 @@
- 
--libcamelmbox_la_LDFLAGS = -version-info 0:0:0
-+libcamelmbox_la_LDFLAGS = -avoid-version
- 
---- camel/providers/mh/Makefile.in.orig	Sat Aug 19 19:26:36 2000
-+++ camel/providers/mh/Makefile.in	Wed Aug 23 11:39:46 2000
-@@ -180,3 +180,3 @@
- 
--libcamelmh_la_LDFLAGS = -version-info 0:0:0
-+libcamelmh_la_LDFLAGS = -avoid-version
+--- camel/providers/imap/Makefile.in.orig	Fri Dec 15 10:01:48 2000
++++ camel/providers/imap/Makefile.in	Fri Dec 15 17:22:52 2000
+@@ -188,3 +188,3 @@
+ 
+-libcamelimap_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
++libcamelimap_la_LDFLAGS = $(KRB4_LDFLAGS) -avoid-version
+
+--- camel/providers/local/Makefile.in.orig	Fri Dec 15 17:26:16 2000
++++ camel/providers/local/Makefile.in	Fri Dec 15 18:11:47 2000
+@@ -188,3 +188,3 @@
+ 
+-libcamellocal_la_LDFLAGS = -version-info 0:0:0
++libcamellocal_la_LDFLAGS = -avoid-version
  
 --- camel/providers/nntp/Makefile.in.orig	Sat Aug 19 19:26:36 2000
 +++ camel/providers/nntp/Makefile.in	Wed Aug 23 11:40:11 2000
diff --git a/mail/evolution-devel/files/patch-ah b/mail/evolution-devel/files/patch-ah
deleted file mode 100644
index 92e9ce533671..000000000000
--- a/mail/evolution-devel/files/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
---- mail/mail-crypto.c.orig	Fri Aug 11 15:27:12 2000
-+++ mail/mail-crypto.c	Wed Aug 23 11:17:44 2000
-@@ -189,7 +189,7 @@
- 
-         passwd_next = passphrase;
-         passwd_remaining = strlen (passphrase);
--        passwd_incr = fpathconf (passwd_fds[1], _PC_PIPE_BUF);
-+        passwd_incr = 1024; /* XXX: no fpathconf() in libc_r? */
- 	/* Use a reasonable default value on error. */
-         if (passwd_incr <= 0)
- 		passwd_incr = 1024;
-@@ -197,7 +197,7 @@
- 
- 	input_next = input;
- 	input_remaining = strlen (input);
--	input_incr = fpathconf (ip_fds[1], _PC_PIPE_BUF);
-+	input_incr = 1024; /* XXX: no fpathconf() in libc_r? */
- 	if (input_incr <= 0)
-                 input_incr = 1024;
- 	input_eof_seen = FALSE;