Added new revision with fix for gcc-4.3 compile issues (bug #227245).

Package-Manager: portage-2.1.4.4

5 files changed, 139 insertions, 6 deletions

diff --git a/sci-biology/treeviewx/ChangeLog b/sci-biology/treeviewx/ChangeLog
index cf011aaccb25..52c917009e2c 100644
--- a/sci-biology/treeviewx/ChangeLog
+++ b/sci-biology/treeviewx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/treeviewx
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.16 2007/04/30 03:51:41 dirtyepic Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.17 2008/06/16 10:45:59 markusle Exp $
+
+*treeviewx-0.5.1-r1 (16 Jun 2008)
+
+  16 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/treeviewx-0.5.1-gcc4.3.patch, +treeviewx-0.5.1-r1.ebuild:
+  Added new revision with fix for gcc-4.3 compile issues (bug #227245).
+  Thanks much to Marek Miller <mlm@shells.pl> for his patch.
 
   30 Apr 2007; Ryan Hill <dirtyepic@gentoo.org> treeviewx-0.5.1.ebuild:
   Use wxwidgets.eclass
diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index e51c90e4cb4d..668593bc4c7a 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -1,6 +1,8 @@
+AUX treeviewx-0.5.1-gcc4.3.patch 2569 RMD160 89b9b0451d33987d04e96a3485587efed490d17a SHA1 246de7afc6b079458b76ac48e8c7135b7aa282bd SHA256 c7548f33160a07f2755db10620a3304ea3e08d5a36996c99191030fe9b605311
 AUX treeviewx-gcc-3.4.patch 1993 RMD160 1f9bc8764baee71be7490ac80744ae201f22ea1b SHA1 60fe792aea3f8be41ab0efc453dd52d31ea3f783 SHA256 8a6449a278d0e24b7430a327e0e8505fe590b4b6c4d57318534bac72f15457bc
 AUX treeviewx-wxt.patch 1854 RMD160 9531ffb260bff7d7c26023558db07b7773c790b7 SHA1 e3d56f36477a0b0b7c4d5f3a08cd5f8b0a698f09 SHA256 2881ec0a4644434320d284a4024f18cba765245de99fa7b50c3cc20ab7a37eb4
 DIST tv-0.5.1.tar.gz 426745 RMD160 27c92a0f43c59c8988fe2d1410adb6de429e94c9 SHA1 0b0887477ca0d9ded6d0ee8bef014b6208e1fc14 SHA256 118bdbefb3f21636b1ba9da92e1b2029cb4d7d9944f4d02d2deace4ebb14c2d1
-EBUILD treeviewx-0.5.1.ebuild 1258 RMD160 0acc1e95b1cde029523d0a749d3ac03c17475489 SHA1 c37c5ef7a1cca8b27a8b0822fa7f683325d833bb SHA256 71aaebcbfcaed472b6836b685c8c7227ae533dcbcba5dee4af85e9783f85900f
-MISC ChangeLog 2729 RMD160 8e667b1ad488ad21cfa5faf7b1174942998cce80 SHA1 10bceb03ca16c1245de40e5619e9e1e4fa95dbc3 SHA256 dad3ab323dd74f34db6e39a86e5f9c602fd8275894c73b2997861ff580168e4e
+EBUILD treeviewx-0.5.1-r1.ebuild 1301 RMD160 d66a4fa99983755c7566ba77013609a5d9ff4e0d SHA1 e4d071b3f8842c0ef01e50f958ad0938b72526c7 SHA256 9a82c4610994f350c1d660691bab6c0e8670b50eb57c6900809b351cc5d38f17
+EBUILD treeviewx-0.5.1.ebuild 1257 RMD160 07692825218cdd392b56f1f7ffdd6bf6ed9d12e7 SHA1 d7c0ea4ac24ca642a8d94f31ef77ec1b09767cd4 SHA256 362feab097d8731ebef16ce1740fac2339950a7d5614816d4c069714dd44a92b
+MISC ChangeLog 3017 RMD160 0ff5d953aaf5ed49e397af96953e58c894bc3297 SHA1 3660fd358492c2e0b09f34793c3b66b52fdaa8af SHA256 3068a25cc1d64aca6b2f15297fd4d90965efe0a19381b8dddc7c3168273b6c71
 MISC metadata.xml 531 RMD160 106b4a1816bca4933e7841c9509be25678ef3c86 SHA1 fb289150f453d53ab9f7343511fb22e36562373c SHA256 bede76a003b94174e1358e950c77fe3dfeb2df31095eb9cb357e37ef4c83072f
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
new file mode 100644
index 000000000000..7d42d962eaff
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
@@ -0,0 +1,75 @@
+diff -Naur tv-0.5.1/TreeLib/Parse.cpp tv-0.5.1.new/TreeLib/Parse.cpp
+--- tv-0.5.1/TreeLib/Parse.cpp	2002-02-23 07:22:32.000000000 -0500
++++ tv-0.5.1.new/TreeLib/Parse.cpp	2008-06-16 06:32:30.000000000 -0400
+@@ -20,7 +20,9 @@
+  */
+ 
+  // $Id: treeviewx-0.5.1-gcc4.3.patch,v 1.1 2008/06/16 10:46:00 markusle Exp $
+- 
++
++
++#include <cstring> 
+ #include <ctype.h>
+ #include "Parse.h"
+ 
+diff -Naur tv-0.5.1/TreeLib/TreeLib.cpp tv-0.5.1.new/TreeLib/TreeLib.cpp
+--- tv-0.5.1/TreeLib/TreeLib.cpp	2004-05-13 08:22:11.000000000 -0400
++++ tv-0.5.1.new/TreeLib/TreeLib.cpp	2008-06-16 06:32:30.000000000 -0400
+@@ -24,6 +24,8 @@
+ #include "TreeLib.h"
+ #include "Parse.h"
+ 
++
++#include <cstdlib>
+ #include <vector>
+ 
+ 
+diff -Naur tv-0.5.1/TreeLib/treereader.cpp tv-0.5.1.new/TreeLib/treereader.cpp
+--- tv-0.5.1/TreeLib/treereader.cpp	2003-09-10 08:58:16.000000000 -0400
++++ tv-0.5.1.new/TreeLib/treereader.cpp	2008-06-16 06:32:30.000000000 -0400
+@@ -21,6 +21,8 @@
+  
+  // $Id: treeviewx-0.5.1-gcc4.3.patch,v 1.1 2008/06/16 10:46:00 markusle Exp $
+ 
++#include <cstring>
++#include <cstdlib>
+ #include "treereader.h"
+ 
+ #if __MWERKS__
+diff -Naur tv-0.5.1/ncl-2.0/src/charactersblock.cpp tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp
+--- tv-0.5.1/ncl-2.0/src/charactersblock.cpp	2002-12-10 06:35:49.000000000 -0500
++++ tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp	2008-06-16 06:32:30.000000000 -0400
+@@ -1,3 +1,5 @@
++
++#include <cstring>
+ #include "nexusdefs.h"
+ #include "xnexus.h"
+ #include "nexustoken.h"
+diff -Naur tv-0.5.1/ncl-2.0/src/nexus.cpp tv-0.5.1.new/ncl-2.0/src/nexus.cpp
+--- tv-0.5.1/ncl-2.0/src/nexus.cpp	2002-12-10 06:35:50.000000000 -0500
++++ tv-0.5.1.new/ncl-2.0/src/nexus.cpp	2008-06-16 06:32:30.000000000 -0400
+@@ -1,3 +1,5 @@
++
++#include <cstring>
+ #include "nexusdefs.h"
+ #include "xnexus.h"
+ #include "nexustoken.h"
+diff -Naur tv-0.5.1/ncl-2.0/src/nexustoken.cpp tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp
+--- tv-0.5.1/ncl-2.0/src/nexustoken.cpp	2005-04-29 10:28:17.000000000 -0400
++++ tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp	2008-06-16 06:32:30.000000000 -0400
+@@ -1,3 +1,5 @@
++
++#include <cstring>
+ #include "nexusdefs.h"
+ #include "xnexus.h"
+ #include "nexustoken.h"
+diff -Naur tv-0.5.1/ncl-2.0/src/nxsstring.cpp tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp
+--- tv-0.5.1/ncl-2.0/src/nxsstring.cpp	2001-02-02 07:55:40.000000000 -0500
++++ tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp	2008-06-16 06:32:30.000000000 -0400
+@@ -1,3 +1,6 @@
++
++#include <cstring>
++
+ #ifdef __BORLANDC__
+ 	// Undefine __MINMAX_DEFINED so that min and max are correctly defined
+ 	#ifdef __MINMAX_DEFINED
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r1.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..b8408d8098b4
--- /dev/null
+++ b/sci-biology/treeviewx/treeviewx-0.5.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.5.1-r1.ebuild,v 1.1 2008/06/16 10:45:59 markusle Exp $
+
+inherit eutils wxwidgets
+
+DESCRIPTION="A phylogenetic tree viewer"
+HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
+SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/0.5/tv-${PV}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="=x11-libs/wxGTK-2.6*"
+
+S="${WORKDIR}/tv-${PV}"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/wxGTK X; then
+		echo
+		eerror "TreeViewX requires an SVG library which is part of the"
+		eerror "optional X support in the \"x11-libs/wxGTK\" package. To"
+		eerror "install TreeViewX on your system, first recompile"
+		eerror "\"x11-libs/wxGTK\" with the \"X\" USE flag enabled, then try"
+		eerror "to install TreeViewX again."
+		die "X support not enabled in \"x11-libs/wxGTK\""
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-wxt.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+}
+
+src_compile() {
+	WX_GTK_VER="2.6"
+	need-wxwidgets gtk2
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+}
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1.ebuild
index 5141d4569de0..b599bb54e658 100644
--- a/sci-biology/treeviewx/treeviewx-0.5.1.ebuild
+++ b/sci-biology/treeviewx/treeviewx-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.5.1.ebuild,v 1.6 2007/04/30 03:51:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.5.1.ebuild,v 1.7 2008/06/16 10:45:59 markusle Exp $
 
 inherit eutils wxwidgets