Add gcc-4 patch for bug 137053. Thanks to P Purkayastha <punarbasu at gmail dot com>.

(Portage version: 2.1-r1)

4 files changed, 52 insertions, 3 deletions

diff --git a/net-analyzer/nam/ChangeLog b/net-analyzer/nam/ChangeLog
index 4b7ac53ac93c..c528b3934f79 100644
--- a/net-analyzer/nam/ChangeLog
+++ b/net-analyzer/nam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nam
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.9 2006/01/22 14:43:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.10 2006/08/01 23:24:39 vanquirius Exp $
+
+  01 Aug 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/nam-1.11-gcc4.patch, nam-1.11.ebuild:
+  Add gcc-4 patch for bug 137053. Thanks to P Purkayastha <punarbasu at gmail
+  dot com>.
 
   22 Jan 2006; Peter Volkov <pva@gentoo.org> nam-1.10.ebuild,
   nam-1.11.ebuild:
diff --git a/net-analyzer/nam/files/digest-nam-1.11 b/net-analyzer/nam/files/digest-nam-1.11
index e2b160b727ab..851c0ef9f24e 100644
--- a/net-analyzer/nam/files/digest-nam-1.11
+++ b/net-analyzer/nam/files/digest-nam-1.11
@@ -1,2 +1,6 @@
 MD5 4f242d98f924f6e66edbd05f256e8fa5 nam-1.11.patch 681
+RMD160 e57babbf4621453985607269d66cd771df5b768d nam-1.11.patch 681
+SHA256 cdb5639ff6df6084290e737fd4a778a2d7c65cf45e3bb07b3363981618832ccd nam-1.11.patch 681
 MD5 2627e85637d7ae8caf477d4e76b6f5e0 nam-src-1.11.tar.gz 4358578
+RMD160 0b2c2550018a67b4081d5799a91d9964b4f731c8 nam-src-1.11.tar.gz 4358578
+SHA256 64d5f8e048d42e98a4c41af34355ac576d58718cb66a52d710ebdb9abb495919 nam-src-1.11.tar.gz 4358578
diff --git a/net-analyzer/nam/files/nam-1.11-gcc4.patch b/net-analyzer/nam/files/nam-1.11-gcc4.patch
new file mode 100644
index 000000000000..44b449b070e3
--- /dev/null
+++ b/net-analyzer/nam/files/nam-1.11-gcc4.patch
@@ -0,0 +1,38 @@
+diff -Nur nam-1.11.orig/netgraph.h nam-1.11/netgraph.h
+--- nam-1.11.orig/netgraph.h	2000-05-18 14:06:32.000000000 -0400
++++ nam-1.11/netgraph.h	2006-06-17 02:36:36.000000000 -0400
+@@ -68,7 +68,7 @@
+ 	virtual void handle(const TraceEvent&, double now, int direction);
+ 	virtual int command(int argc, const char *const *argv);
+ 	virtual void BoundingBox(BBox&);
+-	virtual void NetGraph::render(GraphView* view);
++	virtual void render(GraphView* view);
+     protected:
+ 	GraphView *views_;
+ 	float graphdata_[MAX_GRAPH];
+diff -Nur nam-1.11.orig/node.h nam-1.11/node.h
+--- nam-1.11.orig/node.h	2001-08-09 21:45:47.000000000 -0400
++++ nam-1.11/node.h	2006-06-17 02:17:40.000000000 -0400
+@@ -223,7 +223,7 @@
+ 	Queue* queue() { return queue_; }
+ 	void add_sess_queue(unsigned int grp, Queue *q);
+ 	char * getTclScript();
+-	char * Node::getTclScriptLabel();
++	char * getTclScriptLabel();
+ 	void setTclScript(const char * label, const char * script);
+ 
+ 	int command(int argc, const char * const * argv);
+diff -Nur nam-1.11.orig/parser.h nam-1.11/parser.h
+--- nam-1.11.orig/parser.h	2005-01-24 14:53:07.000000000 -0500
++++ nam-1.11/parser.h	2006-06-17 02:16:59.000000000 -0400
+@@ -94,8 +94,8 @@
+ class ParseTable {
+ public:
+   //<zheng: +++>
+-  static bool ParseTable::nam4wpan;
+-  static int ParseTable::wpan_bradius;
++  static bool nam4wpan;
++  static int wpan_bradius;
+   //</zheng: +++>
+   TraceSyntax * syntax_list;
+ private:
diff --git a/net-analyzer/nam/nam-1.11.ebuild b/net-analyzer/nam/nam-1.11.ebuild
index ad2152c2592c..2d5eeb08f6f2 100644
--- a/net-analyzer/nam/nam-1.11.ebuild
+++ b/net-analyzer/nam/nam-1.11.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/nam/nam-1.11.ebuild,v 1.4 2006/01/22 14:43:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.11.ebuild,v 1.5 2006/08/01 23:24:39 vanquirius Exp $
 
 inherit eutils
 
@@ -44,7 +44,9 @@ findtclver() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	EPATCH_OPTS="-d ${S} -p0" epatch ${DISTDIR}/${P}.patch
+	EPATCH_OPTS="-d ${S} -p0" epatch "${DISTDIR}"/${P}.patch
+	# bug 137053
+	epatch "${FILESDIR}"/${PN}-1.11-gcc4.patch
 }
 
 src_compile() {