Change sys-libs/db depend wrt #218467. Fix building with GCC 4.3 wrt #218465. Thanks to Peter Alfredsen. Also use econf, and stop patching econf generated Makefile in src_compile.

(Portage version: 2.1.5_rc6)

2 files changed, 80 insertions, 11 deletions

diff --git a/net-misc/jigdo/files/jigdo-0.7.3-gcc43.patch b/net-misc/jigdo/files/jigdo-0.7.3-gcc43.patch
new file mode 100644
index 000000000000..07356f0233ee
--- /dev/null
+++ b/net-misc/jigdo/files/jigdo-0.7.3-gcc43.patch
@@ -0,0 +1,80 @@
+diff -ur jigdo-0.7.3.orig/src/compat.hh jigdo-0.7.3/src/compat.hh
+--- jigdo-0.7.3.orig/src/compat.hh	2005-07-02 10:21:35.000000000 -0700
++++ jigdo-0.7.3/src/compat.hh	2008-03-11 23:01:45.000000000 -0700
+@@ -20,6 +20,7 @@
+ 
+ #include <string>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd-jigdo.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+diff -ur jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc jigdo-0.7.3/src/gtk/gtk-single-url.cc
+--- jigdo-0.7.3.orig/src/gtk/gtk-single-url.cc	2005-10-15 14:27:39.000000000 -0700
++++ jigdo-0.7.3/src/gtk/gtk-single-url.cc	2008-03-11 23:05:48.000000000 -0700
+@@ -15,6 +15,7 @@
+ 
+ #include <time.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ #include <autoptr.hh>
+ #include <gtk-single-url.hh>
+diff -ur jigdo-0.7.3.orig/src/gtk/jigdo.cc jigdo-0.7.3/src/gtk/jigdo.cc
+--- jigdo-0.7.3.orig/src/gtk/jigdo.cc	2005-07-09 15:21:04.000000000 -0700
++++ jigdo-0.7.3/src/gtk/jigdo.cc	2008-03-11 23:06:26.000000000 -0700
+@@ -16,6 +16,8 @@
+ #  include <unistd-jigdo.h>
+ #endif
+ 
++#include <string.h>
++
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ur jigdo-0.7.3.orig/src/recursedir.cc jigdo-0.7.3/src/recursedir.cc
+--- jigdo-0.7.3.orig/src/recursedir.cc	2006-05-14 11:23:31.000000000 -0700
++++ jigdo-0.7.3/src/recursedir.cc	2008-03-11 23:04:21.000000000 -0700
+@@ -32,6 +32,7 @@
+ #include <recursedir.hh>
+ 
+ #include <iostream>
++#include <string.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+diff -ur jigdo-0.7.3.orig/src/util/configfile.cc jigdo-0.7.3/src/util/configfile.cc
+--- jigdo-0.7.3.orig/src/util/configfile.cc	2003-09-27 14:31:04.000000000 -0700
++++ jigdo-0.7.3/src/util/configfile.cc	2008-03-11 23:05:00.000000000 -0700
+@@ -19,6 +19,8 @@
+ #include <iostream>
+ #include <fstream>
+ 
++#include <string.h>
++
+ #include <configfile.hh>
+ #include <string.hh>
+ //______________________________________________________________________
+diff -ur jigdo-0.7.3.orig/src/util/md5sum.hh jigdo-0.7.3/src/util/md5sum.hh
+--- jigdo-0.7.3.orig/src/util/md5sum.hh	2005-04-09 16:09:52.000000000 -0700
++++ jigdo-0.7.3/src/util/md5sum.hh	2008-03-11 23:07:04.000000000 -0700
+@@ -28,6 +28,8 @@
+ 
+ #include <config.h>
+ 
++#include <string.h>
++
+ #include <cstdlib>
+ #include <iosfwd>
+ #include <string>
+diff -ur jigdo-0.7.3.orig/src/util/string-utf.cc jigdo-0.7.3/src/util/string-utf.cc
+--- jigdo-0.7.3.orig/src/util/string-utf.cc	2004-09-11 16:26:30.000000000 -0700
++++ jigdo-0.7.3/src/util/string-utf.cc	2008-03-11 23:07:43.000000000 -0700
+@@ -15,6 +15,7 @@
+ #include <glib.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include <debug.hh>
+ #include <string-utf.hh>
diff --git a/net-misc/jigdo/files/makefile.patch b/net-misc/jigdo/files/makefile.patch
deleted file mode 100644
index 3dfd67524e15..000000000000
--- a/net-misc/jigdo/files/makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2003-07-29 18:50:19.000000000 -0400
-+++ Makefile	2003-07-29 18:50:45.000000000 -0400
-@@ -80,7 +80,7 @@
- 		$(INSTALL) -d "$(DESTDIR)$(datadir)/jigdo"
- 		$(INSTALL_SCRIPT) "$(srcdir)/scripts/jigdo-lite" \
- 		    "$(DESTDIR)$(bindir)"
--		sed -e 's%"\(mirrors.jigdo"\)%"$(datadir)/jigdo/debian-\1%' \
-+		sed -e 's%"\(mirrors.jigdo"\)%"/usr/share/jigdo/debian-\1%' \
- 		    <"$(srcdir)/scripts/jigdo-lite" \
- 		    >"$(DESTDIR)$(bindir)/jigdo-lite"
- 		$(INSTALL_DATA) "$(srcdir)/scripts/debian-mirrors.jigdo" \