gcc-3.4 fix

4 files changed, 187 insertions, 21 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index eece11f850cd..1586595010c2 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.36 2004/12/14 14:38:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.37 2004/12/18 20:07:46 lu_zero Exp $
+
+  18 Dec 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/graphviz-1.16-build.patch, graphviz-1.16.ebuild:
+  Fix gcc-3.4 compatibility, thanks to Rodolfo Boer <rodolfo_mv@libero.it> for
+  the patch
 
   14 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> graphviz-1.16.ebuild:
   Can't seperate out GD yet, still a few bugs.
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 5189e889f562..f5e3d7d5918b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 db4406af2d88208a337cc9f1aacc67d0 graphviz-1.16.ebuild 1635
+MD5 4e0a2a27c3cb84d8e84220d34a1c67f7 graphviz-1.12.ebuild 1385
 MD5 67732cb5b21729d0b06c9ace3c2c8b19 graphviz-1.10.ebuild 1288
 MD5 8b0273ef6af8ab79235d87d1c09ee85c graphviz-1.12-r1.ebuild 1888
-MD5 b08249b79c40f36e06f95715020d52dc ChangeLog 5030
+MD5 9d5c7ef8de90c45062bdf6046df1a660 ChangeLog 5229
+MD5 471f3434ce3b8613003755dbec97b3c1 graphviz-1.16.ebuild 1671
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
-MD5 4e0a2a27c3cb84d8e84220d34a1c67f7 graphviz-1.12.ebuild 1385
-MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
-MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
-MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
+MD5 436cf9347b2758967b44b6f4db7174f2 files/digest-graphviz-1.16 66
 MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
+MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
+MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
 MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
-MD5 436cf9347b2758967b44b6f4db7174f2 files/digest-graphviz-1.16 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-Comment: Robbat2 @ Orbis-Terrarum Networks
-
-iD8DBQFBvvuEPpIsIjIzwiwRAissAKDXkzNwElN6DfYmkXZms6npOg3dPgCgpntc
-4TqTn71Ik+AzpepgwcI+JGk=
-=RdbN
------END PGP SIGNATURE-----
+MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
+MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
diff --git a/media-gfx/graphviz/files/graphviz-1.16-build.patch b/media-gfx/graphviz/files/graphviz-1.16-build.patch
new file mode 100644
index 000000000000..774ecdd6d354
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-1.16-build.patch
@@ -0,0 +1,171 @@
+diff -Naur graphviz-1.16.orig/dynagraph/common/emitGraph.h graphviz-1.16/dynagraph/common/emitGraph.h
+--- graphviz-1.16.orig/dynagraph/common/emitGraph.h	2004-12-15 10:33:13.782250240 +0100
++++ graphviz-1.16/dynagraph/common/emitGraph.h	2004-12-15 10:37:57.826069016 +0100
+@@ -18,7 +18,7 @@
+ template<typename G>
+ void emitGraph(std::ostream &os,G *g) {
+   os << "digraph " << mquote(gd<Name>(g));
+-  os << " {" << endl << "\tgraph ";
++  os << " {" << std::endl << "\tgraph ";
+   emitAttrs(os,gd<StrAttrs>(g));
+   for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) {
+     os << '\t' << mquote(gd<Name>(*ni)) << ' ';
+@@ -44,7 +44,7 @@
+ 	Name &gname = (ati!=gd<StrAttrs>(g).end())?ati->second:gd<Name>(g);
+ 
+ 	os << "digraph " << mquote(gname);
+-	os << " {" << endl << "\tgraph ";
++	os << " {" << std::endl << "\tgraph ";
+ 	emitAttrs(os,gd<StrAttrs>(g));
+ 	for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) {
+ 		StrAttrs::iterator ati = gd<StrAttrs>(*ni).find("label");
+diff -Naur graphviz-1.16.orig/dynagraph/common/LGraph-cdt.h graphviz-1.16/dynagraph/common/LGraph-cdt.h
+--- graphviz-1.16.orig/dynagraph/common/LGraph-cdt.h	2004-12-15 10:33:13.704262096 +0100
++++ graphviz-1.16/dynagraph/common/LGraph-cdt.h	2004-12-15 10:37:37.368179088 +0100
+@@ -232,10 +232,10 @@
+ 			return !(*this==other);
+ 		}
+ 		inedge_iter inIter() {
+-			return head()->inIter(this);
++			return this->head()->inIter(this);
+ 		}
+ 		outedge_iter outIter() {
+-			return tail()->outIter(this);
++			return this->tail()->outIter(this);
+ 		}
+ 	};
+ 	// workaround for circular typing problems w/ friend decl: do not call!
+diff -Naur graphviz-1.16.orig/dynagraph/common/traversal.h graphviz-1.16/dynagraph/common/traversal.h
+--- graphviz-1.16.orig/dynagraph/common/traversal.h	2004-12-15 10:33:13.783250088 +0100
++++ graphviz-1.16/dynagraph/common/traversal.h	2004-12-15 10:38:10.825092864 +0100
+@@ -78,10 +78,10 @@
+ 	}
+ 	DFS &operator++() {
+ 		if(m_curr.e)
+-			gd<Hit>(m_curr.e)[m_hitpos] = true;
++			gd<Hit>(m_curr.e)[this->m_hitpos] = true;
+ 		else {
+ 			assert(m_curr.n);
+-			gd<Hit>(m_curr.n)[m_hitpos] = true;
++			gd<Hit>(m_curr.n)[this->m_hitpos] = true;
+ 		}
+ 		// try edges
+ 		if(m_curr.n && follow())
+@@ -143,10 +143,10 @@
+ 	}
+ 	bool outs(typename G::outedge_iter start) {
+ 		for(typename G::outedge_iter ei = start; ei!=m_curr.n->outs().end(); ++ei)
+-			if(!gd<Hit>(*ei)[m_hitpos]) {
++			if(!gd<Hit>(*ei)[this->m_hitpos]) {
+ 				m_stack.push(m_curr);
+ 				m_curr.e = *ei;
+-				if(!gd<Hit>(m_curr.e->head)[m_hitpos])
++				if(!gd<Hit>(m_curr.e->head)[this->m_hitpos])
+ 					m_curr.n = m_curr.e->head;
+ 				else
+ 					m_curr.n = 0;
+@@ -156,10 +156,10 @@
+ 	}
+ 	bool ins(typename G::inedge_iter start) {
+ 		for(typename G::inedge_iter ei = start; ei!=m_curr.n->ins().end(); ++ei)
+-			if(!gd<Hit>(*ei)[m_hitpos]) {
++			if(!gd<Hit>(*ei)[this->m_hitpos]) {
+ 				m_stack.push(m_curr);
+ 				m_curr.e = *ei;
+-				if(!gd<Hit>(m_curr.e->tail)[m_hitpos])
++				if(!gd<Hit>(m_curr.e->tail)[this->m_hitpos])
+ 					m_curr.n = m_curr.e->tail;
+ 				else
+ 					m_curr.n = 0;
+@@ -180,8 +180,8 @@
+ 		return true;
+ 	}
+ 	bool next() {
+-		for(;m_nodeiter!=m_g->parent->nodes().end();++m_nodeiter) 
+-			if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
++		for(;m_nodeiter!=this->m_g->parent->nodes().end();++m_nodeiter) 
++			if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
+ 				m_curr.e = 0;
+ 				m_curr.n = *m_nodeiter;
+ 				m_nodeiter++;
+@@ -205,31 +205,31 @@
+ 		if(last.n) {
+ 			if(m_inwards) 
+ 				for(typename G::inedge_iter ei = last.n->ins().begin(); ei!=last.n->ins().end(); ++ei)
+-					if(!gd<Hit>(*ei)[m_hitpos]) {
++					if(!gd<Hit>(*ei)[this->m_hitpos]) {
+ 						Node *t = (*ei)->tail;
+-						if(gd<Hit>(t)[m_hitpos])
++						if(gd<Hit>(t)[this->m_hitpos])
+ 							t = 0;
+ 						else
+-							gd<Hit>(t)[m_hitpos] = true;
++							gd<Hit>(t)[this->m_hitpos] = true;
+ 						m_queue.push(V(*ei,t));
+-						gd<Hit>(*ei)[m_hitpos] = true;
++						gd<Hit>(*ei)[this->m_hitpos] = true;
+ 					}
+ 			if(m_outwards) 
+ 				for(typename G::outedge_iter ei = last.n->outs().begin(); ei!=last.n->outs().end(); ++ei)
+-					if(!gd<Hit>(*ei)[m_hitpos]) {
++					if(!gd<Hit>(*ei)[this->m_hitpos]) {
+ 						Node *h = (*ei)->head;
+-						if(gd<Hit>(h)[m_hitpos])
++						if(gd<Hit>(h)[this->m_hitpos])
+ 							h = 0;
+ 						else
+-							gd<Hit>(h)[m_hitpos] = true;
++							gd<Hit>(h)[this->m_hitpos] = true;
+ 						m_queue.push(V(*ei,h));
+-						gd<Hit>(*ei)[m_hitpos] = true;
++						gd<Hit>(*ei)[this->m_hitpos] = true;
+ 					}
+ 		}
+ 		if(m_queue.empty())
+-			for(;m_nodeiter!=m_g->nodes().end(); ++m_nodeiter)
+-				if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
+-					gd<Hit>(*m_nodeiter)[m_hitpos] = true;
++			for(;m_nodeiter!=this->m_g->nodes().end(); ++m_nodeiter)
++				if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
++					gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
+ 					m_queue.push(V(0,*m_nodeiter++));
+ 					break;
+ 				}
+@@ -241,7 +241,7 @@
+ 	BFS(G *g,typename G::Node *start = 0,bool inwards=true,bool outwards=true) : Traversal<G>(g),m_inwards(inwards),m_outwards(outwards) {
+ 		m_nodeiter = start?g->iter(start):g->nodes().begin();
+ 		if(m_nodeiter!=g->nodes().end()) {
+-			gd<Hit>(*m_nodeiter)[m_hitpos] = true;
++			gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
+ 			m_queue.push(V(0,*m_nodeiter++));
+ 		}
+ 	}
+diff -Naur graphviz-1.16.orig/dynagraph/dynadag/DynaDAG.h graphviz-1.16/dynagraph/dynadag/DynaDAG.h
+--- graphviz-1.16.orig/dynagraph/dynadag/DynaDAG.h	2004-12-15 10:33:13.784249936 +0100
++++ graphviz-1.16/dynagraph/dynadag/DynaDAG.h	2004-12-15 10:36:44.968145104 +0100
+@@ -209,10 +209,10 @@
+ 		typename Chain<N,E>::edge_iter ei;
+ 	};
+ 	node_iter nBegin() {
+-		return node_iter(eBegin(),false);
++		return node_iter(this->eBegin(),false);
+ 	}
+ 	node_iter nEnd() {
+-		return node_iter(eEnd(),true);
++		return node_iter(this->eEnd(),true);
+ 	}
+ 	Position pos() {
+ 		if(!top() || !DDd(top()).cur.valid)
+@@ -220,10 +220,10 @@
+ 		return Position(DDd(top()).cur.x,(DDd(top()).cur.y+DDd(bottom()).cur.y)/2.0);
+ 	}
+ 	N *top() {
+-		return node?node:first->tail;
++		return node?node:this->first->tail;
+ 	}
+ 	N *bottom() {
+-		return node?node:last->head;
++		return node?node:this->last->head;
+ 	}
+ 	int len() {
+ 		int n=0;
diff --git a/media-gfx/graphviz/graphviz-1.16.ebuild b/media-gfx/graphviz/graphviz-1.16.ebuild
index 1430d5e21ac1..a0e2208ea91c 100644
--- a/media-gfx/graphviz/graphviz-1.16.ebuild
+++ b/media-gfx/graphviz/graphviz-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16.ebuild,v 1.2 2004/12/14 14:38:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16.ebuild,v 1.3 2004/12/18 20:07:46 lu_zero Exp $
 
 inherit gnuconfig eutils
 
@@ -26,7 +26,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
+	epatch ${FILESDIR}/${P}-build.patch
 	# Run gnuconfig_update on all arches, needed at least for mips
 	gnuconfig_update