Fix bug 250845, gcc-4.3 compilation.

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)

3 files changed, 50 insertions, 9 deletions

diff --git a/dev-libs/vdk/ChangeLog b/dev-libs/vdk/ChangeLog
index d1c6c6699873..3b004e634ffb 100644
--- a/dev-libs/vdk/ChangeLog
+++ b/dev-libs/vdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/vdk
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/ChangeLog,v 1.28 2007/08/29 17:36:01 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/ChangeLog,v 1.29 2008/12/20 23:46:12 loki_val Exp $
+
+  20 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/vdk-2.4.1-gcc43.patch, vdk-2.4.1.ebuild:
+  Fix bug 250845, gcc-4.3 compilation.
 
   29 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing gustavoz from metadata due to his retirement (see #36010 for
diff --git a/dev-libs/vdk/files/vdk-2.4.1-gcc43.patch b/dev-libs/vdk/files/vdk-2.4.1-gcc43.patch
new file mode 100644
index 000000000000..f0fe758050c7
--- /dev/null
+++ b/dev-libs/vdk/files/vdk-2.4.1-gcc43.patch
@@ -0,0 +1,33 @@
+diff -Nurpa vdk-2.4.1.orig/vdk/entry.cc vdk-2.4.1/vdk/entry.cc
+--- vdk-2.4.1.orig/vdk/entry.cc	2008-12-15 05:16:06.000000000 +0300
++++ vdk-2.4.1/vdk/entry.cc	2008-12-15 05:16:33.000000000 +0300
+@@ -30,6 +30,7 @@
+ #include "vdk/forms.h"
+ #include "vdk/colors.h"
+ #include <string>
++#include <cstring>
+ static void
+ EntryChanged(GtkWidget* wid, gpointer gp)
+ {
+diff -Nurpa vdk-2.4.1.orig/vdk/image.cc vdk-2.4.1/vdk/image.cc
+--- vdk-2.4.1.orig/vdk/image.cc	2008-12-15 05:16:06.000000000 +0300
++++ vdk-2.4.1/vdk/image.cc	2008-12-15 05:17:41.000000000 +0300
+@@ -32,6 +32,7 @@
+ #include <vdk/tooltips.h>
+ #include <cstdio>
+ #include <string>
++#include <cstring>
+ #include <unistd.h>
+ #include <vdk/rawpixbuf.h>
+ 
+diff -Nurpa vdk-2.4.1.orig/vdk/vdkdate.cc vdk-2.4.1/vdk/vdkdate.cc
+--- vdk-2.4.1.orig/vdk/vdkdate.cc	2008-12-15 05:16:06.000000000 +0300
++++ vdk-2.4.1/vdk/vdkdate.cc	2008-12-15 05:20:52.000000000 +0300
+@@ -28,6 +28,7 @@
+ 
+ #include "vdk/vdkdate.h"
+ #include <string>
++#include <cstring>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <time.h>
diff --git a/dev-libs/vdk/vdk-2.4.1.ebuild b/dev-libs/vdk/vdk-2.4.1.ebuild
index 8262e827bff4..7a633ec1b349 100644
--- a/dev-libs/vdk/vdk-2.4.1.ebuild
+++ b/dev-libs/vdk/vdk-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.4.1.ebuild,v 1.8 2006/10/20 00:31:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.4.1.ebuild,v 1.9 2008/12/20 23:46:12 loki_val Exp $
 
 inherit eutils toolchain-funcs
 
@@ -16,13 +16,17 @@ IUSE="doc debug"
 DEPEND=">x11-libs/gtk+-2.4
 	doc? ( app-doc/doxygen )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/vdk-2.4.1-gcc4.patch
+	epatch "${FILESDIR}"/vdk-2.4.1-gcc43.patch
+}
 
-	cd ${S}
 
-	local myconf=""
 
-	epatch ${FILESDIR}/vdk-2.4.1-gcc4.patch
+src_compile() {
+	local myconf=""
 
 	# gnome and sigc USE flags need to be added later
 	# when upstream decides to re-support them - ChrisWhite
@@ -54,6 +58,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
 }