diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-05-28 20:05:22 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-05-28 20:05:22 +0000 |
commit | 1c416410db8f715406e8c1b1c5dbfcc9ce41ef6b (patch) | |
tree | a694d91e1661f56a56c6c7bbef50ab289ddf04d1 | |
parent | Added missed dependenices, disabled automagic hesiod, bug 292147, thank Dusti... (diff) | |
download | historical-1c416410db8f715406e8c1b1c5dbfcc9ce41ef6b.tar.gz historical-1c416410db8f715406e8c1b1c5dbfcc9ce41ef6b.tar.bz2 historical-1c416410db8f715406e8c1b1c5dbfcc9ce41ef6b.zip |
Fixed correct detection R libs
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
-rw-r--r-- | sci-libs/vtk/ChangeLog | 10 | ||||
-rw-r--r-- | sci-libs/vtk/Manifest | 17 | ||||
-rw-r--r-- | sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch | 178 | ||||
-rw-r--r-- | sci-libs/vtk/files/vtk-5.6.0-R.patch | 57 | ||||
-rw-r--r-- | sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch | 13 | ||||
-rw-r--r-- | sci-libs/vtk/vtk-5.4.2.ebuild | 4 | ||||
-rw-r--r-- | sci-libs/vtk/vtk-5.6.0-r1.ebuild (renamed from sci-libs/vtk/vtk-5.6.0.ebuild) | 3 |
7 files changed, 229 insertions, 53 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index f1e227c77737..904f8b74de1f 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/vtk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.68 2010/05/28 11:51:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.69 2010/05/28 20:05:21 jlec Exp $ + +*vtk-5.6.0-r1 (28 May 2010) + + 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild, + files/vtk-5.4.2-boost-property_map.patch, -vtk-5.6.0.ebuild, + +vtk-5.6.0-r1.ebuild, +files/vtk-5.6.0-R.patch, + files/vtk-5.6.0-boost-property_map.patch: + Fixed correct detection R libs *vtk-5.6.0 (28 May 2010) diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 257b8c64945e..8410b1825ad3 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -4,10 +4,11 @@ Hash: SHA1 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6 -AUX vtk-5.4.2-boost-property_map.patch 3421 RMD160 a46265b2c4d0c4968037be65f2c52b6436c37499 SHA1 09ccc19c0c8503329c42fc8024142d4f632f54d5 SHA256 e905b931bb719c1f94017f0c76b1994aa785ac0a881b4c96bfbaeb6bc95af65b +AUX vtk-5.4.2-boost-property_map.patch 7739 RMD160 98e9bc2431264ad5692b73dc05e54afa697e4108 SHA1 f38f98e9e28a51bb0553b5792cdde39a2c319b3d SHA256 5cbedc7afde2a3515a0bf580927c6a3a0d5b10efa39e649610b0f00a881a4119 AUX vtk-5.4.2-cg-path.patch 1112 RMD160 8b4dca2322f62ed005585ed35cf5e11bc7ea0614 SHA1 903cd304bda40b64825ca0e806cd4d7c738f7165 SHA256 4097db18c46e1e27b6213ef7c82af07144b5a88ac19bdcf645ad7e8264cc9e10 AUX vtk-5.4.2-libpng14.patch 548 RMD160 14217aaaad0b1d44d25574084ee2d3c75d52fbec SHA1 0da1e3168daffd3be3154102d8728135a596f707 SHA256 0aa999ba22804a9c3fe13488c0a014d45acf2a958d9a7336d38ae84e96addbda -AUX vtk-5.6.0-boost-property_map.patch 1083 RMD160 3e342c60bf40160109b4ea581415a6d23a2b9308 SHA1 18b5b6530e701e4a0915292dc4d0cdc43a40aa1e SHA256 a7507808bbb3332c6201a77803c88b2811a31484d54791971c078fd4b70314ee +AUX vtk-5.6.0-R.patch 2463 RMD160 be1ca5c2bd56ce2bf14d23817c1fe69901503345 SHA1 c08a10926064536f06e405b57ece07738896787d SHA256 ffdb077883fd054a1daefa9f1a073877f4f00a5fd4f0fc5bb7021feae5ad2e97 +AUX vtk-5.6.0-boost-property_map.patch 547 RMD160 3ae309e296febc8a5c5d86795fd7766fe12dcdf8 SHA1 e97b4273d94c1647c959469f6f1829101fabb108 SHA256 de594eb23b9a7c18c4c6bb67b507dd627e580fcc7e2ba8c151da94bf2949d3f1 AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 SHA1 fa5afd4b1a943f255e2f20fa35f440518f9d9d95 SHA256 7ad4eb9a82664a2e9c51d8763e594634027051b54ce48bb1c2fca6d1a42635c9 AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d @@ -17,14 +18,14 @@ DIST vtkDocHtml-5.6.0.tar.gz 103149113 RMD160 da6a562345c4c143470ddcc8b926820eec DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26 DIST vtkdata-5.6.0.tar.gz 76716069 RMD160 8499816f6d714408c0f7f584fb4d781f4426e444 SHA1 e0aa26dafd653da1db21fc97ce15aa0599d9c5ad SHA256 e6eed8e5c8d8410d7c7cf007de8c5b56bde77d38fa0522c1ac7751138323c9cf EBUILD vtk-5.4.2-r1.ebuild 6405 RMD160 e2e66c8f39da61dba40b176fb6f6bdd352d5350f SHA1 5523828af953afb4b1eae85873aa8f24a142e11d SHA256 14adbdd1417fb7572355c5f19859209163ac46db29d89fb5a646feb54fb7629b -EBUILD vtk-5.4.2.ebuild 9247 RMD160 3547c38a9a64f5ac3c2d0fd206698211dfa7e08e SHA1 2153b18b06f54d908c220aaec2e3e61574c8e31a SHA256 5cd83226710f1aece303f35860107d079732139ee73e5dc10d14fe661fc3735a -EBUILD vtk-5.6.0.ebuild 6603 RMD160 a808c29709cfc0545d6d3eb156ede2be22635572 SHA1 41729a6d4298476139f39ccecf54a61350eb1803 SHA256 22b293eb76984f09da6c153629659ac53571d443c4ea7923f7caf84904145f98 -MISC ChangeLog 11482 RMD160 4d7bfaccf2da4b095d4bd5d81e523c0f374c555b SHA1 294abea2f774df5d70c2d01c84b9e60568b343b5 SHA256 4f0d7e52cd4c82de3b4a8f072fbcf7aea907835f620eb9b941e7dbaecfb6cad9 +EBUILD vtk-5.4.2.ebuild 9254 RMD160 12f498536cd1b9f0879baf3adb61dd12ee4c74d2 SHA1 7f9a7021c2e28db613365bcdd1f57e4e7ff027c6 SHA256 4ee750ba1a9170c8541a6256d8cc3afc8e211088f712638e0e0dbf2e0aba2a7d +EBUILD vtk-5.6.0-r1.ebuild 6641 RMD160 751ffafba1867b5b2abefcbf82a28b9806bee282 SHA1 de301c815c2b370418910388e6c5a2c440c08cfc SHA256 3301c7e1a1a74754da4a3f9ddc50c9e974f5d3f69433af886978a6f8a706a9ad +MISC ChangeLog 11767 RMD160 b72007ccc5387661b6c6bf8056d0697061323568 SHA1 a1bb50649b1b162a22141d7e9b83adfaeb550922 SHA256 a1552466aa7da905950f58e0270cdc2d4f3238cd711f1cce9c3e0b509b950147 MISC metadata.xml 485 RMD160 f2b347cadff446a8d4e49715b0a855bb300d550e SHA1 98806a4e1cea8d9c95ed22f51ea8b2bcc931831e SHA256 b51fb6c14caf9400d08471ff6f445ba1ec4e748029c9d03bd3a2a6410122803c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkv/rkMACgkQgAnW8HDreRadxgCeJY75Dk5JCt1qQsElD/zQSwur -mZYAn01lDAAs1tfA7E1cCHtm5Of/NhJC -=hwnf +iEYEARECAAYFAkwAIggACgkQgAnW8HDreRZ+LwCdEVluLijfG+iRD4MWDV6iBcCl +RYYAoKNUR+JQ1WNk2XoGb3V/KRIRt+bR +=c7dS -----END PGP SIGNATURE----- diff --git a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch index abba0d2ff5ae..90c6d6a1fed3 100644 --- a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch +++ b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch @@ -1,66 +1,188 @@ -diff -Naur VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx VTK.new/Infovis/Testing/Cxx/TestBoostAdapter.cxx ---- VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2008-11-01 15:22:38.000000000 -0400 -+++ VTK.new/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2010-01-21 17:53:23.000000000 -0500 -@@ -36,7 +36,7 @@ +diff --git a/Infovis/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/Testing/Cxx/TestBoostAdapter.cxx +index 6af2855..484a9e0 100644 +--- a/Infovis/Testing/Cxx/TestBoostAdapter.cxx ++++ b/Infovis/Testing/Cxx/TestBoostAdapter.cxx +@@ -36,8 +36,8 @@ #include <boost/graph/strong_components.hpp> #include <boost/graph/dijkstra_shortest_paths.hpp> #include <boost/graph/transitive_closure.hpp> -#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> +#include <boost/property_map/property_map.hpp> - #include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> #include "vtkGraph.h" -diff -Naur VTK/Infovis/vtkBoostBreadthFirstSearch.cxx VTK.new/Infovis/vtkBoostBreadthFirstSearch.cxx ---- VTK/Infovis/vtkBoostBreadthFirstSearch.cxx 2008-12-02 11:42:38.000000000 -0500 -+++ VTK.new/Infovis/vtkBoostBreadthFirstSearch.cxx 2010-01-21 17:52:56.000000000 -0500 -@@ -46,7 +46,7 @@ + #include "vtkBoostGraphAdapter.h" +diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/vtkBoostBiconnectedComponents.cxx +index 6799dd0..dd759d5 100644 +--- a/Infovis/vtkBoostBiconnectedComponents.cxx ++++ b/Infovis/vtkBoostBiconnectedComponents.cxx +@@ -32,7 +32,7 @@ + #include "vtkGraph.h" + #include "vtkBoostGraphAdapter.h" + #include <boost/graph/biconnected_components.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/version.hpp> + #include <vtksys/stl/vector> + #include <vtksys/stl/utility> +diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/vtkBoostBrandesCentrality.cxx +index e214a72..443c039 100644 +--- a/Infovis/vtkBoostBrandesCentrality.cxx ++++ b/Infovis/vtkBoostBrandesCentrality.cxx +@@ -36,7 +36,7 @@ + + #include <boost/graph/adjacency_list.hpp> + #include <boost/graph/betweenness_centrality.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + + using namespace boost; + +diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/vtkBoostBreadthFirstSearch.cxx +index 7fab585..6e56a7c 100644 +--- a/Infovis/vtkBoostBreadthFirstSearch.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearch.cxx +@@ -46,8 +46,8 @@ #include <boost/graph/visitors.hpp> #include <boost/graph/breadth_first_search.hpp> -#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> +#include <boost/property_map/property_map.hpp> - #include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> #include <boost/pending/queue.hpp> -diff -Naur VTK/Parallel/vtkPBGLBreadthFirstSearch.cxx VTK.new/Parallel/vtkPBGLBreadthFirstSearch.cxx ---- VTK/Parallel/vtkPBGLBreadthFirstSearch.cxx 2008-12-04 16:17:46.000000000 -0500 -+++ VTK.new/Parallel/vtkPBGLBreadthFirstSearch.cxx 2010-01-21 17:53:58.000000000 -0500 -@@ -50,7 +50,7 @@ + #include <vtksys/stl/utility> // for pair +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index 5c64516..64ee7b5 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -39,7 +39,7 @@ + #include "vtkTree.h" + + #include <boost/graph/breadth_first_search.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/vtkBoostConnectedComponents.cxx +index 69e9d8f..c88f4ab 100644 +--- a/Infovis/vtkBoostConnectedComponents.cxx ++++ b/Infovis/vtkBoostConnectedComponents.cxx +@@ -33,7 +33,7 @@ + + #include "vtkBoostGraphAdapter.h" + #include <boost/graph/strong_components.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + + using namespace boost; + +diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx +index b0c89de..7ea3aa9 100644 +--- a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx ++++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx +@@ -40,7 +40,7 @@ PURPOSE. See the above copyright notice for more information. + #include "vtkTree.h" + + #include <boost/graph/kruskal_min_spanning_tree.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx +index 935d0f7..48716fd 100644 +--- a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx ++++ b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx +@@ -39,7 +39,7 @@ PURPOSE. See the above copyright notice for more information. + #include "vtkTree.h" + + #include <boost/graph/prim_minimum_spanning_tree.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx +index 6efa586..222afe9 100644 +--- a/Infovis/vtkTreeLayoutStrategy.cxx ++++ b/Infovis/vtkTreeLayoutStrategy.cxx +@@ -375,8 +375,8 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent) + #include "vtkTreeToBoostAdapter.h" + #include <boost/graph/visitors.hpp> + #include <boost/graph/depth_first_search.hpp> +-#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Parallel/vtkPBGLBreadthFirstSearch.cxx +index 2b4681b..eebeaa9 100644 +--- a/Parallel/vtkPBGLBreadthFirstSearch.cxx ++++ b/Parallel/vtkPBGLBreadthFirstSearch.cxx +@@ -50,8 +50,8 @@ #include <boost/graph/distributed/breadth_first_search.hpp> #include <boost/parallel/algorithm.hpp> #include <boost/graph/visitors.hpp> -#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> +#include <boost/property_map/property_map.hpp> - #include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> #include <boost/pending/queue.hpp> -diff -Naur VTK/Parallel/vtkPBGLMinimumSpanningTree.cxx VTK.new/Parallel/vtkPBGLMinimumSpanningTree.cxx ---- VTK/Parallel/vtkPBGLMinimumSpanningTree.cxx 2008-12-04 16:17:46.000000000 -0500 -+++ VTK.new/Parallel/vtkPBGLMinimumSpanningTree.cxx 2010-01-21 17:54:18.000000000 -0500 -@@ -48,7 +48,7 @@ + #include <vtksys/stl/utility> // for pair +diff --git a/Parallel/vtkPBGLGraphAdapter.h b/Parallel/vtkPBGLGraphAdapter.h +index 7b467b0..bacfd3a 100644 +--- a/Parallel/vtkPBGLGraphAdapter.h ++++ b/Parallel/vtkPBGLGraphAdapter.h +@@ -31,7 +31,7 @@ + #include <boost/graph/distributed/mpi_process_group.hpp> + #include <boost/graph/properties.hpp> + #include <boost/graph/parallel/container_traits.hpp> +-#include <boost/parallel/local_property_map.hpp> ++#include <boost/property_map/parallel/local_property_map.hpp> + #include <boost/serialization/base_object.hpp> + #include <boost/functional/hash.hpp> + //ETX +diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Parallel/vtkPBGLMinimumSpanningTree.cxx +index da4647e..f9c3229 100644 +--- a/Parallel/vtkPBGLMinimumSpanningTree.cxx ++++ b/Parallel/vtkPBGLMinimumSpanningTree.cxx +@@ -48,8 +48,8 @@ #include <boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp> #include <boost/graph/distributed/vertex_list_adaptor.hpp> #include <boost/parallel/global_index_map.hpp> -#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> +#include <boost/property_map/property_map.hpp> - #include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> #include <boost/pending/queue.hpp> -diff -Naur VTK/Parallel/vtkPBGLShortestPaths.cxx VTK.new/Parallel/vtkPBGLShortestPaths.cxx ---- VTK/Parallel/vtkPBGLShortestPaths.cxx 2009-02-23 16:08:57.000000000 -0500 -+++ VTK.new/Parallel/vtkPBGLShortestPaths.cxx 2010-01-21 17:54:36.000000000 -0500 -@@ -49,7 +49,7 @@ + #include <vtksys/stl/utility> // for pair +diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Parallel/vtkPBGLShortestPaths.cxx +index 074143f..8517304 100644 +--- a/Parallel/vtkPBGLShortestPaths.cxx ++++ b/Parallel/vtkPBGLShortestPaths.cxx +@@ -49,8 +49,8 @@ #include <boost/graph/distributed/delta_stepping_shortest_paths.hpp> #include <boost/parallel/algorithm.hpp> -#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> +#include <boost/property_map/property_map.hpp> - #include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> #include <vtksys/stl/utility> // for pair -diff -Naur VTK/Parallel/vtkPBGLVertexColoring.cxx VTK.new/Parallel/vtkPBGLVertexColoring.cxx ---- VTK/Parallel/vtkPBGLVertexColoring.cxx 2008-07-31 13:56:53.000000000 -0400 -+++ VTK.new/Parallel/vtkPBGLVertexColoring.cxx 2010-01-21 17:53:40.000000000 -0500 + +diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Parallel/vtkPBGLVertexColoring.cxx +index 9aa87a0..301a245 100644 +--- a/Parallel/vtkPBGLVertexColoring.cxx ++++ b/Parallel/vtkPBGLVertexColoring.cxx @@ -47,7 +47,7 @@ #include <boost/graph/distributed/boman_et_al_graph_coloring.hpp> diff --git a/sci-libs/vtk/files/vtk-5.6.0-R.patch b/sci-libs/vtk/files/vtk-5.6.0-R.patch new file mode 100644 index 000000000000..1327121c20c6 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.0-R.patch @@ -0,0 +1,57 @@ +diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake +index ee49570..c830db0 100644 +--- a/CMake/FindR.cmake ++++ b/CMake/FindR.cmake +@@ -18,13 +18,12 @@ IF (R_COMMAND) + ENDIF (R_COMMAND) + SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE}) + +-FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") ++FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") + FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).") +-FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).") +-FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).") ++FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).") + FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.") + +-SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE}) ++SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE}) + IF (R_LIBRARY_READLINE) + SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE}) + ENDIF (R_LIBRARY_READLINE) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d4e881..1a828a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA) + ENDIF(JAVA_AWT_LIBRARY) + ENDIF(VTK_WRAP_JAVA) + ++IF(VTK_USE_GNU_R) ++ FIND_PACKAGE(R) ++ENDIF(VTK_USE_GNU_R) + +- ++IF(VTK_USE_BOOST) ++ if (VTK_USE_PARALLEL_BGL) ++ FIND_PACKAGE(Boost 1.39.0 REQUIRED ++ COMPONENTS mpi serialization filesystem system graph_parallel) ++ else (VTK_USE_PARALLEL_BGL) ++ FIND_PACKAGE(Boost REQUIRED) ++ endif (VTK_USE_PARALLEL_BGL) ++ENDIF(VTK_USE_BOOST) + #----------------------------------------------------------------------------- + # The entire VTK tree should use the same include path. + +diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx +index 324e845..56a4869 100644 +--- a/Graphics/vtkRInterface.cxx ++++ b/Graphics/vtkRInterface.cxx +@@ -23,6 +23,7 @@ + #undef HAVE_UINTPTR_T + #ifdef HAVE_VTK_UINTPTR_T + #define HAVE_UINTPTR_T HAVE_VTK_UINTPTR_T ++#include <stdint.h> + #endif + + #include "vtkInformation.h" diff --git a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch index d6b7bda88eb6..9319378acb1a 100644 --- a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch +++ b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch @@ -1,16 +1,3 @@ -diff --git a/Infovis/vtkBoostGraphAdapter.h b/Infovis/vtkBoostGraphAdapter.h -index 5d113ac..d84cb98 100644 ---- a/Infovis/vtkBoostGraphAdapter.h -+++ b/Infovis/vtkBoostGraphAdapter.h -@@ -50,7 +50,7 @@ namespace boost { - // These need to be defined before including other boost stuff - - // Forward declarations are required here, so that we aren't forced -- // to include boost/property_map.hpp. -+ // to include boost/property_map/property_map.hpp. - template<typename> class property_traits; - class read_write_property_map_tag; - diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx index 4a764ea..74d0b53 100644 --- a/Infovis/vtkTreeLayoutStrategy.cxx diff --git a/sci-libs/vtk/vtk-5.4.2.ebuild b/sci-libs/vtk/vtk-5.4.2.ebuild index de617f47fa09..e95db885d3d1 100644 --- a/sci-libs/vtk/vtk-5.4.2.ebuild +++ b/sci-libs/vtk/vtk-5.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.8 2010/05/22 09:19:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.9 2010/05/28 20:05:21 jlec Exp $ EAPI="2" inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt4 @@ -44,7 +44,7 @@ RDEPEND="mpi? ( || ( DEPEND="${RDEPEND} java? ( >=virtual/jdk-1.5 ) - boost? ( dev-libs/boost ) + boost? ( >=dev-libs/boost-1.40 ) >=dev-util/cmake-2.6" S="${WORKDIR}"/VTK diff --git a/sci-libs/vtk/vtk-5.6.0.ebuild b/sci-libs/vtk/vtk-5.6.0-r1.ebuild index 22242c165a3a..2a2e8ea97dc8 100644 --- a/sci-libs/vtk/vtk-5.6.0.ebuild +++ b/sci-libs/vtk/vtk-5.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0.ebuild,v 1.1 2010/05/28 11:51:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r1.ebuild,v 1.1 2010/05/28 20:05:21 jlec Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -70,6 +70,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch epatch "${FILESDIR}"/${P}-boost-property_map.patch epatch "${FILESDIR}"/${P}-libpng14.patch + epatch "${FILESDIR}"/${P}-R.patch sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \ -i Wrapping/Tcl/pkgIndex.tcl.in \ || die "Failed to fix tcl pkgIndex file" |