Added patch so it can compile with gcc3. closes #35771.

4 files changed, 79 insertions, 4 deletions

diff --git a/dev-util/vdkbuilder/ChangeLog b/dev-util/vdkbuilder/ChangeLog
index 5cd37f0773c6..987f71cd39db 100644
--- a/dev-util/vdkbuilder/ChangeLog
+++ b/dev-util/vdkbuilder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/vdkbuilder
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.7 2003/02/24 04:57:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.8 2003/12/14 22:41:32 zul Exp $
+
+  14 Dec 2003; Chuck Short <zul@gentoo.org> vdkbuilder-2.0.3.ebuild,
+  files/vdkbuilder-gcc3.patch:
+  Added patch so that vdkbuilder can be compile on systems that have gcc3.
+  Closes bug #35771.
 
 *vdkbuilder-2.0.3 (12 Aug 2002)
 
diff --git a/dev-util/vdkbuilder/Manifest b/dev-util/vdkbuilder/Manifest
index c157640a39d9..bc3a275f2141 100644
--- a/dev-util/vdkbuilder/Manifest
+++ b/dev-util/vdkbuilder/Manifest
@@ -1,5 +1,6 @@
-MD5 e0cf57912e09daf107050a4155ed9ac2 ChangeLog 763
+MD5 d2f3e06389331dd8cc25b0db2b414d7a vdkbuilder-2.0.3.ebuild 1123
 MD5 f9c7783ae031bcc7faa4846ee3a8700b vdkbuilder-2.0.2.ebuild 1063
-MD5 6af82dff95c3bdbeb84170fdf522edd5 vdkbuilder-2.0.3.ebuild 1013
+MD5 5e2f3f31bd0e571b3b8cae571339fe22 ChangeLog 956
 MD5 99848ddbdb27f9085a04d4be864953c8 files/digest-vdkbuilder-2.0.2 61
 MD5 517f2d1fd4853a2f7c1cf9a915477202 files/digest-vdkbuilder-2.0.3 69
+MD5 27e9a6ce9dccdfa29a4a27cdbb8e371e files/vdkbuilder-gcc3.patch 1522
diff --git a/dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch b/dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch
new file mode 100644
index 000000000000..228f9fad164d
--- /dev/null
+++ b/dev-util/vdkbuilder/files/vdkbuilder-gcc3.patch
@@ -0,0 +1,65 @@
+diff -Naur vdkbuilder2-2.0.3.old/vdkbuilder/vdkb_templates.cc vdkbuilder2-2.0.3/vdkbuilder/vdkb_templates.cc
+--- vdkbuilder2-2.0.3.old/vdkbuilder/vdkb_templates.cc	2002-06-04 07:56:35.000000000 +0000
++++ vdkbuilder2-2.0.3/vdkbuilder/vdkb_templates.cc	2003-12-14 18:07:08.557890952 +0000
+@@ -856,34 +856,34 @@
+  char* pw = getcwd(NULL,MAXPATHLEN);
+  if(pw)
+    {  cwd = pw; free(pw);  }
+- fprintf(fp,"\
+-\n####### Implicit rules\
+-\n.SUFFIXES: .%s .%s\
+-\n\
+-\n.%s.o:\
+-\n\t$(CC) -c   $(CFLAGS) $(INCPATH) $(DEFD) -o $@ $<\
+-\n\
+-\n.%s.o:\
+-\n\t$(C)  -c   $(CFLAGS) $(INCPATH) $(DEFD) -o $@ $<\
+-\n\
+-\n####### Build rules\
+-\n\
+-\nall: $(TARGET)\
+-\n\
+-\n$(TARGET): $(OBJECTS)\
+-\n\t$(LINK)  -o $(TARGET) $(OBJECTS) $(OTHERS_OBJECTS) $(LIBS)\
+-\n\
++ fprintf(fp,"
++\n####### Implicit rules
++\n.SUFFIXES: .%s .%s
++\n
++\n.%s.o:
++\n\t$(CC) -c   $(CFLAGS) $(INCPATH) $(DEFD) -o $@ $<
++\n
++\n.%s.o:
++\n\t$(C)  -c   $(CFLAGS) $(INCPATH) $(DEFD) -o $@ $<
++\n
++\n####### Build rules
++\n
++\nall: $(TARGET)
++\n\
++\n$(TARGET): $(OBJECTS)
++\n\t$(LINK)  -o $(TARGET) $(OBJECTS) $(OTHERS_OBJECTS) $(LIBS)
++\n
+ \n####### Running (used by builder)
+-\nrun: $(TARGET)\
+-\n\tcd %s\
+-\n\t%s $(PRG_ARGS)\
+-\n\tcd %s\
+-\n\
+-\nclean:\
+-\n\t-rm -f $(OBJECTS) $(TARGET)\
+-\n\t-rm -f *~ core\
+-\n\
+-\n####### Compile\
++\nrun: $(TARGET)
++\n\tcd %s
++\n\t%s $(PRG_ARGS)
++\n\tcd %s
++\n
++\nclean:
++\n\t-rm -f $(OBJECTS) $(TARGET)
++\n\t-rm -f *~ core
++\n
++\n####### Compile
+ ",
+ cc_ext,c_ext,cc_ext,c_ext,(char*) path, (char*) builder_exe,(char*) cwd);
+ 
diff --git a/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild
index a7af0f5f413b..e74009d629a9 100644
--- a/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild
+++ b/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild,v 1.7 2003/09/06 08:39:24 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.3.ebuild,v 1.8 2003/12/14 22:41:32 zul Exp $
 #	sdl? ( media-libs/vdksdl )
 # if we figure out xdb... there's a --enable-xdb and vdkxdb
 
@@ -21,6 +21,10 @@ DEPEND="dev-libs/vdk
 src_compile() {
 
 	local myconf
+
+	# Allows vdkbuilder to compile on gcc3 systems.
+	epatch ${FILESDIR}/vdkbuilder-gcc3.patch || die "Patch Failed"
+
 	use nls \
 		&& myconf="${myconf} --enable-nls" \
 		|| myconf="${myconf} --disable-nls"