Slightly modified gcc-4.3 patch since it got mangled by cvs during commit.

Package-Manager: portage-2.1.4.4

3 files changed, 30 insertions, 24 deletions

diff --git a/sci-biology/treeviewx/ChangeLog b/sci-biology/treeviewx/ChangeLog
index 52c917009e2c..2c6f0ac4707e 100644
--- a/sci-biology/treeviewx/ChangeLog
+++ b/sci-biology/treeviewx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/treeviewx
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.18 2008/06/17 10:16:06 markusle Exp $
+
+  17 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  files/treeviewx-0.5.1-gcc4.3.patch:
+  Slightly modified gcc-4.3 patch since it got mangled by cvs during commit.
 
 *treeviewx-0.5.1-r1 (16 Jun 2008)
 
diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index 668593bc4c7a..9fc3d5ca9283 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -1,8 +1,8 @@
-AUX treeviewx-0.5.1-gcc4.3.patch 2569 RMD160 89b9b0451d33987d04e96a3485587efed490d17a SHA1 246de7afc6b079458b76ac48e8c7135b7aa282bd SHA256 c7548f33160a07f2755db10620a3304ea3e08d5a36996c99191030fe9b605311
+AUX treeviewx-0.5.1-gcc4.3.patch 2601 RMD160 2da0e86085e327c55d0bb453b25359dd126b2944 SHA1 3c90941bb5b9a35193949d93b90bb3e03fce67ee SHA256 e2f0a1f1b3c53b61f61e6f8b6d820f37350573ca8ab35866f4cbe96cd654bb6a
 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-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 ChangeLog 3186 RMD160 97097efcb3694a7fb7873093951c60594f267b2b SHA1 96afc1682eb58608d20844b6053c84750545c53a SHA256 ea3ed0847657f543de579b3338467ca2cb595b1f278b7b3d2495580f339ec20c
 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
index 7d42d962eaff..33bd3b1741f6 100644
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
@@ -1,20 +1,21 @@
 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> 
++++ tv-0.5.1.new/TreeLib/Parse.cpp	2008-06-17 06:08:24.000000000 -0400
+@@ -24,6 +24,11 @@
  #include <ctype.h>
  #include "Parse.h"
  
++
++
++
++#include <cstring>
++
+ // Return the next token in the string
+ tokentype Parser::NextToken ()
+ {
 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
++++ tv-0.5.1.new/TreeLib/TreeLib.cpp	2008-06-17 05:58:17.000000000 -0400
 @@ -24,6 +24,8 @@
  #include "TreeLib.h"
  #include "Parse.h"
@@ -26,19 +27,20 @@ diff -Naur tv-0.5.1/TreeLib/TreeLib.cpp tv-0.5.1.new/TreeLib/TreeLib.cpp
  
 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 $
++++ tv-0.5.1.new/TreeLib/treereader.cpp	2008-06-17 06:07:15.000000000 -0400
+@@ -28,6 +28,9 @@
+ 	#include <stdlib.h>
+ #endif
  
 +#include <cstring>
 +#include <cstdlib>
- #include "treereader.h"
- 
- #if __MWERKS__
++
+ //------------------------------------------------------------------------------
+ TreeReader::TreeReader (Tokeniser &p) : parser (p)
+ {
 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
++++ tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp	2008-06-17 05:58:17.000000000 -0400
 @@ -1,3 +1,5 @@
 +
 +#include <cstring>
@@ -47,7 +49,7 @@ diff -Naur tv-0.5.1/ncl-2.0/src/charactersblock.cpp tv-0.5.1.new/ncl-2.0/src/cha
  #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
++++ tv-0.5.1.new/ncl-2.0/src/nexus.cpp	2008-06-17 05:58:17.000000000 -0400
 @@ -1,3 +1,5 @@
 +
 +#include <cstring>
@@ -56,7 +58,7 @@ diff -Naur tv-0.5.1/ncl-2.0/src/nexus.cpp tv-0.5.1.new/ncl-2.0/src/nexus.cpp
  #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
++++ tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp	2008-06-17 05:58:17.000000000 -0400
 @@ -1,3 +1,5 @@
 +
 +#include <cstring>
@@ -65,7 +67,7 @@ diff -Naur tv-0.5.1/ncl-2.0/src/nexustoken.cpp tv-0.5.1.new/ncl-2.0/src/nexustok
  #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
++++ tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp	2008-06-17 05:58:17.000000000 -0400
 @@ -1,3 +1,6 @@
 +
 +#include <cstring>