GCC 3.4 fixes. This might fix bug #82455.

(Portage version: 2.0.51.16)

5 files changed, 139 insertions, 2 deletions

diff --git a/sci-biology/treeviewx/ChangeLog b/sci-biology/treeviewx/ChangeLog
index 8520e0bda641..162410e26047 100644
--- a/sci-biology/treeviewx/ChangeLog
+++ b/sci-biology/treeviewx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/treeviewx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.6 2005/02/23 01:57:46 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.7 2005/02/27 19:48:28 ribosome Exp $
+
+*treeviewx-0.4-r1 (27 Feb 2005)
+
+  27 Feb 2005; Olivier Fisette <ribosome@gentoo.org>
+  +files/treeviewx-gcc-3.4.patch, +treeviewx-0.4-r1.ebuild:
+  GCC 3.4 fixes. This might fix bug #82455.
 
   22 Feb 2005; Olivier Fisette <ribosome@gentoo.org>
   -files/nodeiterator.h.patch, treeviewx-0.4.ebuild:
diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index 2b51df65dfbd..f7f361f0a8f8 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -1,4 +1,7 @@
+MD5 d6732a39b5b92c33cb693bdc7d4522da treeviewx-0.4-r1.ebuild 1401
 MD5 932e271c302fcfab798ce7e5658f8c74 treeviewx-0.4.ebuild 1305
-MD5 7eaa0ff88eb32742eeb5edc69613104d ChangeLog 1208
+MD5 d43ff5b64675466e677f324d0bf8e8ba ChangeLog 1399
 MD5 4a02a793e1530b66640221d52ab8a8ab metadata.xml 523
+MD5 c208b90b136cb1d6147844b45c943663 files/treeviewx-gcc-3.4.patch 1993
 MD5 8d3f96dc6ba46b29f75306900104b6fa files/digest-treeviewx-0.4 58
+MD5 8d3f96dc6ba46b29f75306900104b6fa files/digest-treeviewx-0.4-r1 58
diff --git a/sci-biology/treeviewx/files/digest-treeviewx-0.4-r1 b/sci-biology/treeviewx/files/digest-treeviewx-0.4-r1
new file mode 100644
index 000000000000..f842ea00853f
--- /dev/null
+++ b/sci-biology/treeviewx/files/digest-treeviewx-0.4-r1
@@ -0,0 +1 @@
+MD5 a0f556e474804e59a72ff24ee0d8f10d tv-0.4.tar.gz 336684
diff --git a/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch b/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch
new file mode 100644
index 000000000000..9d64fabb6a9b
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-gcc-3.4.patch
@@ -0,0 +1,73 @@
+--- TreeLib/nodeiterator.h.old	2002-02-24 15:37:17.000000000 -0500
++++ TreeLib/nodeiterator.h	2005-02-27 14:23:30.971981368 -0500
+@@ -128,34 +128,34 @@
+ 
+ template <class N> N *PreorderIterator<N>::begin ()
+ {
+-	cur = root;
+-    return cur;
++	this->cur = this->root;
++    return this->cur;
+ }
+ 
+ template <class N> N *PreorderIterator<N>::next ()
+ {
+-	if (cur->GetChild())
++	if (this->cur->GetChild())
+     {
+-       	stk.push (cur);
+-       	N *p = (N *)(cur->GetChild());
+-        cur = p;
++       	this->stk.push (this->cur);
++       	N *p = (N *)(this->cur->GetChild());
++        this->cur = p;
+     }
+     else
+     {
+-      	while (!stk.empty() && (cur->GetSibling() == NULL))
++      	while (!this->stk.empty() && (this->cur->GetSibling() == NULL))
+         {
+-            cur = stk.top();
+-        	stk.pop();
++            this->cur = this->stk.top();
++        	this->stk.pop();
+         }
+-        if (stk.empty())
+-           	cur = NULL;
++        if (this->stk.empty())
++           	this->cur = NULL;
+         else
+         {
+-        	N *p = (N *)(cur->GetSibling());
+-            cur = p;
++        	N *p = (N *)(this->cur->GetSibling());
++            this->cur = p;
+         }
+     }
+-    return cur;
++    return this->cur;
+ }
+ 
+ 
+--- TreeLib/profile.h.old	2002-12-10 06:37:57.000000000 -0500
++++ TreeLib/profile.h	2005-02-27 14:27:51.205419872 -0500
+@@ -77,7 +77,7 @@
+ 	#include <ctime>
+ #endif    
+ 
+-
++using namespace std;
+ 
+ /**
+  *@typedef std::map <std::string, int, std::less<std::string> > LabelMap;
+--- TreeLib/treedrawer.cpp.old	2003-08-22 06:47:28.000000000 -0400
++++ TreeLib/treedrawer.cpp	2005-02-27 14:26:19.279394752 -0500
+@@ -406,7 +406,7 @@
+         if (q->IsLeaf())
+         {
+             double d = q->GetPathLength() - mMaxPathLength;
+-            mUltrametric = (std::fabs(d) <= 0.0001);
++            mUltrametric = (fabs(d) <= 0.0001);
+ //            cout << mMaxPathLength << ":" << q->GetPathLength() << " " << d << endl;
+         }
+         q = u.next();
diff --git a/sci-biology/treeviewx/treeviewx-0.4-r1.ebuild b/sci-biology/treeviewx/treeviewx-0.4-r1.ebuild
new file mode 100644
index 000000000000..df0d5fb20792
--- /dev/null
+++ b/sci-biology/treeviewx/treeviewx-0.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.4-r1.ebuild,v 1.1 2005/02/27 19:48:28 ribosome Exp $
+
+inherit eutils
+
+DESCRIPTION="A phylogenetic tree viewer"
+HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
+SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/tv-${PV}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=x11-libs/wxGTK-2.4.2-r2"
+
+S=${WORKDIR}/tv-${PV}
+
+pkg_setup() {
+	if ! [ -e /usr/lib/libwx_gtk2-2.4.so ]; then
+		eerror "TreeView X requires the non Unicode, gtk2-enabled version"
+		eerror "of the wxGTK library. This version was not found on your"
+		eerror "system. Please install \">=x11-libs/wx_TK-2.4.2-r2\" with"
+		eerror "the \"gtk2\" \"USE\" flag enabled."
+		die "Could not find non Unicode, gtk2-enabled wxGTK library."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gcc-3.4.patch
+}
+
+src_compile() {
+	econf || die
+	# The configure script may pick the Unicode wxGTK.
+	if grep -q "gtk2u" Makefile; then
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
+		cd TreeLib
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
+		cd ../ncl-2.0
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
+		cd src
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
+	fi
+	cd ${S}
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+}