Fix gcc 4.3 compilation

(Portage version: 2.1.5.5)

4 files changed, 120 insertions, 66 deletions

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index 5b4347169750..b79ed7159d3b 100644
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/freenet6
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.33 2008/06/15 10:44:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.34 2008/06/16 18:05:04 voyageur Exp $
+
+  16 Jun 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/freenet6-5.1-gcc43.patch, -freenet6-4.2.2.ebuild,
+  freenet6-5.1.ebuild:
+  gcc 4.3 compilation fix, thanks to Marek Miller <mlm@shells.pl>
+  Fixes bug #226663. Also remove last 4.2 version
 
   15 Jun 2008; Zac Medico <zmedico@gentoo.org> freenet6-4.2.2.ebuild,
   freenet6-5.0.ebuild, freenet6-5.1.ebuild:
diff --git a/net-misc/freenet6/files/freenet6-5.1-gcc43.patch b/net-misc/freenet6/files/freenet6-5.1-gcc43.patch
new file mode 100644
index 000000000000..fb8e11f6ad48
--- /dev/null
+++ b/net-misc/freenet6/files/freenet6-5.1-gcc43.patch
@@ -0,0 +1,109 @@
+
+
+--- gw6c-messaging/src/clientmsgsender.cc.orig	2008-06-16 15:28:00.000000000 +0000
++++ gw6c-messaging/src/clientmsgsender.cc	2008-06-16 15:28:11.000000000 +0000
+@@ -19,6 +19,8 @@
+ // **************************************************************************
+ #include <gw6cmessaging/clientmsgsender.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ namespace gw6cmessaging
+
+--- gw6c-messaging/src/servermsgsender.cc.orig	2008-06-16 15:31:47.000000000 +0000
++++ gw6c-messaging/src/servermsgsender.cc	2008-06-16 15:31:56.000000000 +0000
+@@ -19,6 +19,8 @@
+ // **************************************************************************
+ #include <gw6cmessaging/servermsgsender.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/namevalueparser.cc.orig	2008-06-16 15:32:41.000000000 +0000
++++ gw6c-config/src/namevalueparser.cc	2008-06-16 15:32:51.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <fstream>
+ #include <time.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #define NV_SEPARATOR          "="                   // Name=value separator
+
+--- gw6c-config/src/gw6cconfig.cc.orig	2008-06-16 15:33:33.000000000 +0000
++++ gw6c-config/src/gw6cconfig.cc	2008-06-16 15:33:43.000000000 +0000
+@@ -25,6 +25,8 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ #include <assert.h>
+ #include <string>
++#include <cstring>
++#include <cstdlib>
+ 
+ // Configuration data variable NAMES
+
+--- gw6c-config/src/gw6cvalidation.cc.orig	2008-06-16 15:34:19.000000000 +0000
++++ gw6c-config/src/gw6cvalidation.cc	2008-06-16 15:34:29.000000000 +0000
+@@ -18,6 +18,8 @@
+ // __________________________________________________________________________
+ // **************************************************************************
+ #include <gw6cconfig/gw6cvalidation.h>
++#include <cstring>
++#include <cstdlib> 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:38:18.000000000 +0000
++++ gw6c-config/src/gw6c_c_wrapper.cc	2008-06-16 15:38:30.000000000 +0000
+@@ -22,6 +22,9 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ using namespace gw6cconfig;
+ #include <assert.h>
++#include <cstring>
++#include <cstdlib>
++
+ 
+ #ifdef WIN32
+ #define strcasecmp      _stricmp
+
+--- gw6c-messaging/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:39:04.000000000 +0000
++++ gw6c-messaging/src/gw6c_c_wrapper.cc	2008-06-16 15:39:20.000000000 +0000
+@@ -17,6 +17,8 @@
+ // Creation Date: December 2006
+ // __________________________________________________________________________
+ // **************************************************************************
++
++#include <cstring>
+ #include <gw6cmessaging/gw6c_c_wrapper.h>
+ #include <gw6cmessaging/clientmsgdataretriever.h>
+ #include <gw6cmessaging/clientmessengerimpl.h>
+
+--- gw6c-config/src/hap6devicemappingconfig.cc.orig	2008-06-16 15:40:58.000000000 +0000
++++ gw6c-config/src/hap6devicemappingconfig.cc	2008-06-16 15:41:09.000000000 +0000
+@@ -22,6 +22,8 @@
+ #include <gw6cconfig/hap6devicemappingconfig.h>
+ #include <gw6cconfig/gw6cuistrings.h>
+ #include <assert.h>
++#include <cstring>
++
+ 
+ 
+ #ifdef WIN32
+
+--- gw6c-config/src/hap6_devmap_c_wrap.cc.orig	2008-06-16 15:41:44.000000000 +0000
++++ gw6c-config/src/hap6_devmap_c_wrap.cc	2008-06-16 15:41:54.000000000 +0000
+@@ -22,6 +22,8 @@
+ #include <gw6cconfig/gw6cuistrings.h>
+ using namespace gw6cconfig;
+ #include <assert.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ #ifdef WIN32
+ #define strcasecmp      _stricmp
+
diff --git a/net-misc/freenet6/freenet6-4.2.2.ebuild b/net-misc/freenet6/freenet6-4.2.2.ebuild
deleted file mode 100644
index c52ebdfb0e84..000000000000
--- a/net-misc/freenet6/freenet6-4.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-4.2.2.ebuild,v 1.8 2008/06/15 10:44:02 zmedico Exp $
-
-inherit eutils versionator
-
-MY_PV=$(replace_all_version_separators "_")
-DESCRIPTION="Client to configure an IPv6 tunnel to freenet6"
-HOMEPAGE="http://www.freenet6.net/"
-SRC_URI="mirror://gentoo/gw6c${MY_PV}src.tar.gz"
-
-LICENSE="VPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~hppa sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/tspc-advanced"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-noretry.patch
-}
-
-src_compile() {
-	emake all target=linux || die "Build Failed"
-}
-
-src_install() {
-	dosbin bin/gw6c
-
-	insopts -m 600
-	insinto /etc/freenet6
-	doins ${FILESDIR}/gw6c.conf
-	exeinto /etc/freenet6/template
-	doexe template/{linux,checktunnel}.sh
-
-	newinitd ${FILESDIR}/gw6c.rc gw6c
-
-	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1*"
-	upgrade_from_1_x=$?
-}
-
-pkg_postinst() {
-	if [[ $upgrade_from_1_x = 0 ]] ; then
-		ewarn "Warning: you are upgrading from an older version"
-		ewarn "The configuration file has been renamed to gw6c.conf"
-		ewarn "Remember to port your personal settings from tspc.conf to it"
-		ewarn "The init script has been renamed to 'gw6c',"
-	else
-		elog "The freenet6 ebuild installs an init script named 'gw6c'"
-	fi
-	elog "to coincide with the name of the client binary installed"
-	elog "To add support for a freenet6 connection at startup, do"
-	elog ""
-	elog "# rc-update add gw6c default"
-}
diff --git a/net-misc/freenet6/freenet6-5.1.ebuild b/net-misc/freenet6/freenet6-5.1.ebuild
index d890a07348ae..d58d8f84f120 100644
--- a/net-misc/freenet6/freenet6-5.1.ebuild
+++ b/net-misc/freenet6/freenet6-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.3 2008/06/15 10:44:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.4 2008/06/16 18:05:04 voyageur Exp $
 
 inherit eutils versionator toolchain-funcs
 
@@ -22,6 +22,9 @@ S="${WORKDIR}/tspc-advanced"
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}"
+
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
 	for i in gw6c-config gw6c-messaging ; do
 		sed -i -e "/ARCHIVER=/s:ar:$(tc-getAR):" \
 			-e "/COMPILER=/s:g++:$(tc-getCXX):" \