Fix to compile with gcc-4.3. Bug 231428. Thanks to Bernd Buschinski <b.buschinski@web.de>

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 47 insertions, 5 deletions

diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog
index c2b2205318e9..4d53166ec817 100644
--- a/net-misc/vde/ChangeLog
+++ b/net-misc/vde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vde
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.13 2008/03/11 21:34:48 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.14 2008/07/20 14:38:55 loki_val Exp $
+
+  20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/vde-2.1.6-gcc43.patch, vde-2.1.6-r1.ebuild:
+  Fix to compile with gcc-4.3. Bug 231428. Thanks to Bernd Buschinski
+  <b.buschinski@web.de>
 
   11 Mar 2008; Stefan Schweizer <genstef@gentoo.org> files/vde.init:
   needs to start after net.tap according to Etaoin Shrdlu
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 7ac9d6cffdd2..ecd51a942923 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,4 +1,5 @@
 AUX Unixterm_20070403.patch 5054 RMD160 76a8200d0975aa172f39a6937799a5ef2b9bbd40 SHA1 05d891782ea64a639e4c68ade3533a34695d392f SHA256 a17223c1b93c74e9e97636f47da3dd194f499f3b216cf17c50f1f37913b3533a
+AUX vde-2.1.6-gcc43.patch 1010 RMD160 0b3d0872a6ed18fe5bc5e9cebb586194c461b206 SHA1 2983befee2e55ef596c1666ceef3c72290eb672c SHA256 00b6d858a0a5e196555ce5574b9e98ea27b34e737ab1afdfc691b600770465ab
 AUX vde.conf 187 RMD160 7d3a650dba0d33401095d444cda3230c5fa8f963 SHA1 0ad41e477982d4eba8afa07d183eb6ed55116eab SHA256 00ff15f4850f8afda12dacfe548a29d70a3d504513066e66a6570b88851c858f
 AUX vde.init 748 RMD160 085fb762b9d58b1bb20d8dcd6556b0894bf08a7e SHA1 ebf9963efae6bf012f5ea2b4aa2914928866c338 SHA256 20d3370dc6bdaac5ab5288815223857bb37696c30dbf31d1a613df4e426e2070
 DIST vde-1.5.7.tgz 139314 RMD160 213f87ea465b76c276b660f0b0733820273f5ca7 SHA1 81fc285e56b431a13220e8c8df80b492482b5158 SHA256 a80d907c1705e9b4f5eb62593753f5120e8e71066395fa3241eb425825ccf82b
@@ -8,7 +9,7 @@ DIST vde2-2.1.6.tar.bz2 390222 RMD160 083be75c89c5915ce7fa8a2b300a09af49e793cd S
 EBUILD vde-1.5.7.ebuild 1071 RMD160 14899d9d97fd620d1c862e926a7149d09e94a9ba SHA1 31f55b4cefce0fcf2d90a2a274deea702f007eb6 SHA256 8220d177d0fe2036ca660f46ee62ef1a1ebe3ef83089543e5dac3febc701b969
 EBUILD vde-2.0.2.ebuild 1051 RMD160 2a4c834459c06f1bd5c6722334bfb4a270a3b867 SHA1 027c3559baac6d1dc865375588934b9fd6aec330 SHA256 e74e99838101022ea30072604ea35ea357118ab2d543bcf41ec4781341fdb248
 EBUILD vde-2.1.1.ebuild 1094 RMD160 8a28f10f084a3fb157976536f5f1a5f0fd993df7 SHA1 aeb6d8647cc1a2c3cffbed0c26d26ab2c7d98da0 SHA256 e761ee77b652cc36aeb1e4c30ece490334a002907c7d537c929399ef06ebb9a5
-EBUILD vde-2.1.6-r1.ebuild 1194 RMD160 8a393336f84d879d5c29af2339383f4275ee5991 SHA1 f69ddce1dd76da275f60eb1c0666b2a3a0185221 SHA256 acccfebea54d80e77dbd507373c21c4d508d162e9396215d0fe77cadbf75cda4
+EBUILD vde-2.1.6-r1.ebuild 1232 RMD160 aa471f5cbd545b784acfe95e0d9a20e5c02c74ff SHA1 53addcc646619dea1fd878a45ae241f1f7fc0e5c SHA256 ee4396977c6f052e4b3770a3b48f3898b39652d7d1ad20c919c908cca82501ff
 EBUILD vde-2.1.6.ebuild 1099 RMD160 07755732ad3c5cd8c2494d335f20bbef31452419 SHA1 ed9ac22b2e39dbbbf1e91bab245b583ddb46f719 SHA256 dc83def2128b6ae678997429774e7023e4d36e0b078d979f0f56ef2c8cf10e09
-MISC ChangeLog 2654 RMD160 32d20af95ef09dfd8742528fae16123fbdae75a1 SHA1 7797bdb597f7a082069aaca0a3c7d5454aed9c2c SHA256 257e88d2523e8256af58479d65db95f86c2ae847134f1ae0882a90ebb431b911
+MISC ChangeLog 2856 RMD160 639767cc2332db7242eda8321b0dee79fa717a44 SHA1 2faeb2b961b92589d5c30b7a038b2a9966cd84b5 SHA256 ebf5ce132b494e56a47aa510e46bebac6b5036bbdaa73919a6282eb686db5e9d
 MISC metadata.xml 291 RMD160 f134ca695b605c125c3a8e317126398add351bfa SHA1 850bb9320f9809aebd4b8e3cd6c14b17e162112f SHA256 a8fe4b8510e66b25e88c52a68c7c6482e0fc787d585b673becec195e9e4d3c4f
diff --git a/net-misc/vde/files/vde-2.1.6-gcc43.patch b/net-misc/vde/files/vde-2.1.6-gcc43.patch
new file mode 100644
index 000000000000..80122b26c75d
--- /dev/null
+++ b/net-misc/vde/files/vde-2.1.6-gcc43.patch
@@ -0,0 +1,35 @@
+--- slirpvde/slirpvde.c	2006-12-18 16:24:27.000000000 +0100
++++ slirpvde/slirpvde.c	2008-07-10 15:44:39.000000000 +0200
+@@ -32,8 +32,8 @@
+ 
+ #include "misc.h"
+ 
++#include <limits.h>
+ #ifdef VDE_DARWIN
+-#	include <limits.h>
+ #	if defined HAVE_SYSLIMITS_H
+ #		include <syslimits.h>
+ #	elif defined HAVE_SYS_SYSLIMITS_H
+--- vde_plug2tap/vde_plug2tap.c	2006-12-18 14:49:57.000000000 +0100
++++ vde_plug2tap/vde_plug2tap.c	2008-07-10 15:45:12.000000000 +0200
+@@ -30,9 +30,9 @@
+ #include <linux/if_tun.h>
+ #endif
+ 
++#include <limits.h>
+ #ifdef VDE_DARWIN
+ #	define TAP_PREFIX "/dev/"
+-#	include <limits.h>
+ #	if defined HAVE_SYSLIMITS_H
+ #		include <syslimits.h>
+ #	elif defined HAVE_SYS_SYSLIMITS_H
+--- vdetaplib/libvdetap.c	2006-12-18 14:36:05.000000000 +0100
++++ vdetaplib/libvdetap.c	2008-07-10 15:47:24.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <linux/ioctl.h>
+ #include <linux/if.h>
+ #include <linux/if_tun.h>
++#include <limits.h>
+ 
+ #define TUNTAPPATH "/dev/net/tun"
+ #define VDETAPEXEC LIBEXECDIR "/vdetap"
diff --git a/net-misc/vde/vde-2.1.6-r1.ebuild b/net-misc/vde/vde-2.1.6-r1.ebuild
index 61a4b9813ae5..8f397511eefe 100644
--- a/net-misc/vde/vde-2.1.6-r1.ebuild
+++ b/net-misc/vde/vde-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6-r1.ebuild,v 1.2 2007/07/12 02:52:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6-r1.ebuild,v 1.3 2008/07/20 14:38:55 loki_val Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/Unixterm_20070403.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 }
 
 src_install() {