Add a patch to fix compilation with gcc 4.1.

(Portage version: 2.1_rc4-r2)

3 files changed, 120 insertions, 3 deletions

diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog
index c07dc1fc7783..34b7237e5f1d 100644
--- a/net-analyzer/ns/ChangeLog
+++ b/net-analyzer/ns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ns
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.22 2006/05/15 20:50:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.23 2006/06/19 15:12:54 chutzpah Exp $
+
+  19 Jun 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/ns-2.29-gcc41.patch, ns-2.29.ebuild:
+  Add a patch to fix compilation with gcc 4.1.
 
 *ns-2.29 (15 May 2006)
 
diff --git a/net-analyzer/ns/files/ns-2.29-gcc41.patch b/net-analyzer/ns/files/ns-2.29-gcc41.patch
new file mode 100644
index 000000000000..dbe7c01e4e30
--- /dev/null
+++ b/net-analyzer/ns/files/ns-2.29-gcc41.patch
@@ -0,0 +1,113 @@
+--- sctp/sctp.h.orig	2006-06-16 16:41:37.000000000 -0400
++++ sctp/sctp.h	2006-06-16 16:42:04.000000000 -0400
+@@ -702,7 +702,7 @@
+ 
+   /* debugging functions
+    */
+-  void SctpAgent::DumpSendBuffer();
++  void DumpSendBuffer();
+ 
+   /* sctp association state variable
+    */
+--- ./mobile/god.h.orig	2006-06-16 16:43:19.000000000 -0400
++++ ./mobile/god.h	2006-06-16 16:43:41.000000000 -0400
+@@ -85,20 +85,20 @@
+ 		return sqrt(X*X + Y*Y + Z*Z);
+ 	}
+ 
+-	inline void vector::operator=(const vector a) {
++	inline void operator=(const vector a) {
+ 		X = a.X;
+ 		Y = a.Y;
+ 		Z = a.Z;
+ 	}
+-	inline void vector::operator+=(const vector a) {
++	inline void operator+=(const vector a) {
+ 		X += a.X;
+ 		Y += a.Y;
+ 		Z += a.Z;
+ 	}
+-	inline int vector::operator==(const vector a) {
++	inline int operator==(const vector a) {
+ 		return (X == a.X && Y == a.Y && Z == a.Z);
+ 	}
+-	inline int vector::operator!=(const vector a) {
++	inline int operator!=(const vector a) {
+ 		return (X != a.X || Y != a.Y || Z != a.Z);
+ 	}
+ 	inline vector operator-(const vector a) {
+--- dsr/dsragent.h.orig	2006-06-16 17:04:40.000000000 -0400
++++ dsr/dsragent.h	2006-06-16 17:05:47.000000000 -0400
+@@ -284,4 +284,7 @@
+ 	static DSRAgent_List agthead;
+ };
+ 
++void XmitFlowFailureCallback(Packet *pkt, void *data);
++void XmitFailureCallback(Packet *pkt, void *data);
++
+ #endif // _DSRAgent_h
+--- diffusion/diffusion.h.orig	2006-06-16 17:08:27.000000000 -0400
++++ diffusion/diffusion.h	2006-06-16 17:08:45.000000000 -0400
+@@ -208,6 +208,8 @@
+   friend class SendBufTimer;
+ };
+ 
++void XmitFailedCallback(Packet *pkt, void *data);
++
+ #endif
+ 
+ 
+--- diffusion/omni_mcast.h.orig	2006-06-16 17:10:46.000000000 -0400
++++ diffusion/omni_mcast.h	2006-06-16 17:11:00.000000000 -0400
+@@ -225,6 +225,7 @@
+ 
+ };
+ 
++void OmniMcastXmitFailedCallback(Packet *pkt, void *data);
+ 
+ 
+ #endif
+--- tcp/tcp-sack-rh.cc.orig	2006-06-16 17:11:33.000000000 -0400
++++ tcp/tcp-sack-rh.cc	2006-06-16 17:11:45.000000000 -0400
+@@ -65,7 +65,7 @@
+ 	virtual void estadjust();
+ 	virtual void rhclear();
+ 	virtual void computefack();
+-	virtual void SackRHTcpAgent::newack(Packet* pkt);
++	virtual void newack(Packet* pkt);
+  protected:
+ 	int fack_;	          /* the FACK state variable  */
+ 	int retran_data_;         /* the number of retransmitted packets in the pipe  */
+--- pgm/pgm-agent.cc.orig	2006-06-16 17:12:44.000000000 -0400
++++ pgm/pgm-agent.cc	2006-06-16 17:12:56.000000000 -0400
+@@ -304,7 +304,7 @@
+ 
+   void print_stats();
+ 
+-  void PgmAgent::trace_event(char *evType, double evTime);
++  void trace_event(char *evType, double evTime);
+ 
+ #ifdef PGM_DEBUG
+   void display_packet(Packet *pkt);
+--- pgm/pgm-sender.cc.orig	2006-06-16 17:13:32.000000000 -0400
++++ pgm/pgm-sender.cc	2006-06-16 17:13:41.000000000 -0400
+@@ -186,7 +186,7 @@
+ 
+   void display_packet(Packet *pkt); // For debugging.
+ 
+-  void PgmSender::trace_event(char *evType, nsaddr_t daddr, double evTime); 
++  void trace_event(char *evType, nsaddr_t daddr, double evTime); 
+ 
+   EventTrace * et_; 	//Trace Object for custom Event Traces
+ 
+--- pgm/pgm-receiver.cc.orig	2006-06-16 17:14:37.000000000 -0400
++++ pgm/pgm-receiver.cc	2006-06-16 17:14:52.000000000 -0400
+@@ -183,7 +183,7 @@
+   void print_stats();
+   void display_packet(Packet *pkt); // For debugging.
+ 
+-  void PgmReceiver::trace_event(char *evType, double evTime);
++  void trace_event(char *evType, double evTime);
+ 
+   EventTrace * et_;  //Trace Object for Custom Event Trace
+ 
diff --git a/net-analyzer/ns/ns-2.29.ebuild b/net-analyzer/ns/ns-2.29.ebuild
index e513cb10a1a8..b7e295baf629 100644
--- a/net-analyzer/ns/ns-2.29.ebuild
+++ b/net-analyzer/ns/ns-2.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.29.ebuild,v 1.1 2006/05/15 20:50:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.29.ebuild,v 1.2 2006/06/19 15:12:54 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -31,7 +31,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 #	epatch ${FILESDIR}/${P}-gentoo.diff
-#	epatch ${FILESDIR}/${P}-gcc41.patch
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 	sed '/$(CC)/s!-g!$(CFLAGS)!g' ${S}/indep-utils/model-gen/Makefile
 }