commit: cf6756245d694a3a9d2d3fc3816556b7ae886ea4 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Wed May 31 21:06:31 2017 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Wed May 31 21:14:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf675624
sci-visualization/paraview: drop old versions Package-Manager: Portage-2.3.5, Repoman-2.3.2 sci-visualization/paraview/Manifest | 2 - .../paraview/files/paraview-4.0.1-Protobuf.patch | 72 --- .../paraview/files/paraview-4.0.1-gcc-4.7.patch | 28 -- .../files/paraview-4.0.1-removesqlite.patch | 517 ------------------- .../files/paraview-4.0.1-vtk-cg-path.patch | 36 -- .../files/paraview-4.1.0-glxext-legacy.patch | 9 - .../files/paraview-4.1.0-no-fatal-warnings.patch | 19 - .../files/paraview-4.1.0-vtk-freetype.patch | 22 - .../paraview-4.3.1-fix-development-install.patch | 16 - .../files/paraview-4.4.0-removesqlite.patch | 550 --------------------- .../paraview/paraview-4.1.0-r2.ebuild | 301 ----------- .../paraview/paraview-5.1.2-r1.ebuild | 285 ----------- 12 files changed, 1857 deletions(-) diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 59e0714fd48..3e38d76c5b2 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,3 +1 @@ -DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96 -DIST ParaView-v5.1.2.tar.gz 51635420 SHA256 ff02b7307a256b7c6e8ad900dee5796297494df7f9a0804fe801eb2f66e6a187 SHA512 9204732ecbe5048c96536a2d63f37ec51f331416bab11c982797d07cd0233e1424193d1c8cac6dfe7e91696997f8aaf92c3a32d7b05674c0b176d93444672e40 WHIRLPOOL 1bbb95672279317304dde1f3123a51f3ca787f0f0b1a28ce09e53f0fbfdf685da89efeb2b13c0409982cbc5566e3984542eeeb519aa757bdd849186135c57a64 DIST ParaView-v5.2.0.tar.gz 47087129 SHA256 894e42ef8475bb49e4e7e64f4ee2c37c714facd18bfbb1d6de7f69676b062c96 SHA512 d46b71a03717bde164fe2b6cdcc1c478384ad0d379e203e75e69e1532f8703b4ce12f8992d39e61d09e2ad7bbf1e249fc1f00c4cdd65aabef831e0dca83485f1 WHIRLPOOL bfc63e95d899e9d7be5432f5e6b6e7a68731726b199a7dd897a4bcbe242537fa5cf2210d20ef4c725ab8af92609b0fb875078ec537577a074672776771f4fd2f diff --git a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch deleted file mode 100644 index 6a09a1ac9a7..00000000000 --- a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://paraview.org/Bug/view.php?id=13656 - -diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt ---- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.000000000 -0700 -+++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-13 15:17:53.980027098 -0700 -@@ -81,16 +81,24 @@ - #------------------------------------------------------------------------------ - # Generate the protbuf message file. - #------------------------------------------------------------------------------ --get_target_property(PROTOC_LOCATION protoc_compiler LOCATION) -+if (VTK_USE_SYSTEM_PROTOBUF) -+ set (_PROTOC_COMPILER protoc) -+ set (_PROTOC_DEPEND "") -+else() -+ set (_PROTOC_COMPILER protoc_compiler) -+ set (_PROTOC_DEPEND ${_PROTOC_COMPILER}) -+endif() -+ -+get_target_property(PROTOC_LOCATION ${_PROTOC_COMPILER} LOCATION) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h - ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc - -- COMMAND protoc_compiler -+ COMMAND ${_PROTOC_COMPILER} - "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}" - --proto_path "@CMAKE_CURRENT_SOURCE_DIR@" - "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto" -- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto ${_PROTOC_DEPEND} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - -@@ -109,5 +117,9 @@ - vtk_module_library(vtkPVServerImplementationCore - ${Module_SRCS}) - -+if (VTK_USE_SYSTEM_PROTOBUF) -+ target_link_libraries(vtkPVServerImplementationCore ${CMAKE_THREAD_LIBS_INIT}) -+endif() -+ - add_dependencies(vtkPVServerImplementationCore - protobuf_code_generation) -diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt ---- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.000000000 -0700 -+++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-13 15:09:31.526673020 -0700 -@@ -34,7 +34,7 @@ - set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR}) - set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME}) - --vtk_module_third_party(protobuf -+vtk_module_third_party(Protobuf - INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src - LIBRARIES protobuf - ) -@@ -42,10 +42,12 @@ - # protobuf exports it's build-dir targets to a custom file - # (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export - # build-dir targets ourselves. --vtk_target_export(protobuf) --vtk_target_export(protobuf-lite) --if (NOT CMAKE_CROSSCOMPILING) -- vtk_compile_tools_target_export(protoc_compiler) -+if (NOT VTK_USE_SYSTEM_PROTOBUF) -+ vtk_target_export(protobuf) -+ vtk_target_export(protobuf-lite) -+ if (NOT CMAKE_CROSSCOMPILING) -+ vtk_compile_tools_target_export(protoc_compiler) -+ endif() - endif() - - # All these exports don't add any install rules. However we make protobuf itself diff --git a/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch b/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch deleted file mode 100644 index 1b941cfa943..00000000000 --- a/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: fix FTBFS with gcc-4.7 -Author: Mathieu Malaterre <[email protected]> -Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208 -Reviewed-by: Anton Gladky <[email protected]> -Last-Update: 2012-05-08 - ---- a/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx -+++ b/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx -@@ -35,6 +35,8 @@ - using namespace ftgl; - #endif - -+#include <stdint.h> -+ - // Print debug info - #define VTK_FTFC_DEBUG 0 - #define VTK_FTFC_DEBUG_CD 0 ---- a/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx -+++ b/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx -@@ -36,6 +36,8 @@ - using namespace ftgl; - #endif - -+#include <stdint.h> -+ - // Print debug info - - #define VTK_FTFC_DEBUG 0 diff --git a/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch deleted file mode 100644 index be495b4fbb3..00000000000 --- a/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch +++ /dev/null @@ -1,517 +0,0 @@ -Description: Import patch from VTK to remove sqlite -Author: Mathieu Malaterre <[email protected]> -Last-Update: Mon Feb 11 14:58:03 UTC 2013 - -remove the internal copy of sqlite (vtksqlite) -http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch - ---- VTK/IO/SQL/vtkSQLiteDatabase.cxx -+++ VTK/IO/SQL/vtkSQLiteDatabase.cxx -@@ -29,7 +29,7 @@ - #include <vtksys/ios/fstream> - #include <vtksys/ios/sstream> - --#include <vtksqlite/vtk_sqlite3.h> -+#include <sqlite3.h> - - vtkStandardNewMacro(vtkSQLiteDatabase); - -@@ -307,15 +307,15 @@ - } - } - -- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); -+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); - -- if (result != VTK_SQLITE_OK) -+ if (result != SQLITE_OK) - { - vtkDebugMacro(<<"SQLite open() failed. Error code is " - << result << " and message is " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - -- vtk_sqlite3_close(this->SQLiteInstance); -+ sqlite3_close(this->SQLiteInstance); - return false; - } - else -@@ -334,8 +334,8 @@ - } - else - { -- int result = vtk_sqlite3_close(this->SQLiteInstance); -- if (result != VTK_SQLITE_OK) -+ int result = sqlite3_close(this->SQLiteInstance); -+ if (result != SQLITE_OK) - { - vtkWarningMacro(<< "Close(): SQLite returned result code " << result); - } -@@ -374,7 +374,7 @@ - if (!status) - { - vtkErrorMacro(<< "GetTables(): Database returned error: " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - query->Delete(); - return this->Tables; - } -@@ -403,7 +403,7 @@ - if (!status) - { - vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - query->Delete(); - return NULL; - } -@@ -467,10 +467,10 @@ - // ---------------------------------------------------------------------- - bool vtkSQLiteDatabase::HasError() - { -- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); -+ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); - } - - const char* vtkSQLiteDatabase::GetLastErrorText() - { -- return vtk_sqlite3_errmsg(this->SQLiteInstance); -+ return sqlite3_errmsg(this->SQLiteInstance); - } ---- VTK/IO/SQL/vtkSQLiteQuery.cxx -+++ VTK/IO/SQL/vtkSQLiteQuery.cxx -@@ -25,7 +25,7 @@ - #include "vtkVariant.h" - #include "vtkVariantArray.h" - --#include <vtksqlite/vtk_sqlite3.h> -+#include <sqlite3.h> - - #include <assert.h> - -@@ -43,7 +43,7 @@ - { - this->Statement = NULL; - this->InitialFetch = true; -- this->InitialFetchResult=VTK_SQLITE_DONE; -+ this->InitialFetchResult=SQLITE_DONE; - this->LastErrorText = NULL; - this->TransactionInProgress = false; - } -@@ -61,7 +61,7 @@ - { - if (this->Database != NULL) - { -- vtk_sqlite3_finalize(this->Statement); -+ sqlite3_finalize(this->Statement); - this->Statement = NULL; - } - } -@@ -131,8 +131,8 @@ - if (this->Statement) - { - vtkDebugMacro(<<"Finalizing old statement"); -- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); -- if (finalizeStatus != VTK_SQLITE_OK) -+ int finalizeStatus = sqlite3_finalize(this->Statement); -+ if (finalizeStatus != SQLITE_OK) - { - vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " - << finalizeStatus); -@@ -151,19 +151,19 @@ - return false; - } - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - const char *unused_statement; - -- int prepareStatus = vtk_sqlite3_prepare_v2(db, -+ int prepareStatus = sqlite3_prepare_v2(db, - this->Query, - static_cast<int>(strlen(this->Query)), - &this->Statement, - &unused_statement); - -- if (prepareStatus != VTK_SQLITE_OK) -+ if (prepareStatus != SQLITE_OK) - { -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " -+ this->SetLastErrorText(sqlite3_errmsg(db)); -+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " - << this->GetLastErrorText() - << " on statement: '" - << this->Query << "'"); -@@ -194,31 +194,31 @@ - } - else - { -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - - vtkDebugMacro(<<"Execute(): Query ready to execute."); - - this->InitialFetch = true; -- int result = vtk_sqlite3_step(this->Statement); -+ int result = sqlite3_step(this->Statement); - this->InitialFetchResult = result; - -- if (result == VTK_SQLITE_DONE) -+ if (result == SQLITE_DONE) - { - this->SetLastErrorText(NULL); - this->Active = true; - return true; - } -- else if (result != VTK_SQLITE_ROW) -+ else if (result != SQLITE_ROW) - { - vtkSQLiteDatabase *dbContainer = - vtkSQLiteDatabase::SafeDownCast(this->Database); - assert(dbContainer != NULL); - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " -+ this->SetLastErrorText(sqlite3_errmsg(db)); -+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " - << this->GetLastErrorText()); - this->Active = false; - return false; -@@ -239,7 +239,7 @@ - } - else - { -- return vtk_sqlite3_column_count(this->Statement); -+ return sqlite3_column_count(this->Statement); - } - } - -@@ -259,7 +259,7 @@ - } - else - { -- return vtk_sqlite3_column_name(this->Statement, column); -+ return sqlite3_column_name(this->Statement, column); - } - } - -@@ -279,22 +279,22 @@ - } - else - { -- switch (vtk_sqlite3_column_type(this->Statement, column)) -+ switch (sqlite3_column_type(this->Statement, column)) - { -- case VTK_SQLITE_INTEGER: -+ case SQLITE_INTEGER: - return VTK_INT; -- case VTK_SQLITE_FLOAT: -+ case SQLITE_FLOAT: - return VTK_FLOAT; -- case VTK_SQLITE_TEXT: -+ case SQLITE_TEXT: - return VTK_STRING; -- case VTK_SQLITE_BLOB: -+ case SQLITE_BLOB: - return VTK_STRING; // until we have a BLOB type of our own -- case VTK_SQLITE_NULL: -+ case SQLITE_NULL: - return VTK_VOID; // ??? what makes sense here? - default: - { - vtkErrorMacro(<<"GetFieldType(): Unknown data type " -- << vtk_sqlite3_column_type(this->Statement, column) -+ << sqlite3_column_type(this->Statement, column) - <<" from SQLite."); - return VTK_VOID; - } -@@ -315,7 +315,7 @@ - { - vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); - this->InitialFetch = false; -- if (this->InitialFetchResult == VTK_SQLITE_DONE) -+ if (this->InitialFetchResult == SQLITE_DONE) - { - return false; - } -@@ -326,12 +326,12 @@ - } - else - { -- int result = vtk_sqlite3_step(this->Statement); -- if (result == VTK_SQLITE_DONE) -+ int result = sqlite3_step(this->Statement); -+ if (result == SQLITE_DONE) - { - return false; - } -- else if (result == VTK_SQLITE_ROW) -+ else if (result == SQLITE_ROW) - { - return true; - } -@@ -339,8 +339,8 @@ - { - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -+ sqlite3 *db = dbContainer->SQLiteInstance; -+ this->SetLastErrorText(sqlite3_errmsg(db)); - vtkErrorMacro(<<"NextRow(): Database returned error code " - << result << " with the following message: " - << this->GetLastErrorText()); -@@ -366,33 +366,33 @@ - } - else - { -- switch (vtk_sqlite3_column_type(this->Statement, column)) -+ switch (sqlite3_column_type(this->Statement, column)) - { -- case VTK_SQLITE_INTEGER: -- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); -+ case SQLITE_INTEGER: -+ return vtkVariant(sqlite3_column_int(this->Statement, column)); - -- case VTK_SQLITE_FLOAT: -- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); -+ case SQLITE_FLOAT: -+ return vtkVariant(sqlite3_column_double(this->Statement, column)); - -- case VTK_SQLITE_TEXT: -+ case SQLITE_TEXT: - { - vtksys_ios::ostringstream str; -- str << vtk_sqlite3_column_text(this->Statement, column); -+ str << sqlite3_column_text(this->Statement, column); - return vtkVariant(vtkStdString(str.str())); - } - -- case VTK_SQLITE_BLOB: -+ case SQLITE_BLOB: - { - // This is a hack ... by passing the BLOB to vtkStdString with an explicit - // byte count, we ensure that the string will store all of the BLOB's bytes, - // even if there are NULL values. - - return vtkVariant(vtkStdString( -- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), -- vtk_sqlite3_column_bytes(this->Statement, column))); -+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), -+ sqlite3_column_bytes(this->Statement, column))); - } - -- case VTK_SQLITE_NULL: -+ case SQLITE_NULL: - default: - return vtkVariant(); - } -@@ -423,11 +423,11 @@ - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = true; - this->SetLastErrorText(NULL); -@@ -451,7 +451,7 @@ - { - if (this->Statement) - { -- vtk_sqlite3_finalize(this->Statement); -+ sqlite3_finalize(this->Statement); - this->Statement = NULL; - } - -@@ -463,11 +463,11 @@ - - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = false; - this->SetLastErrorText(NULL); -@@ -499,11 +499,11 @@ - - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = false; - this->SetLastErrorText(NULL); -@@ -647,11 +647,11 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } -- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); -+ int status = sqlite3_bind_int(this->Statement, index+1, value); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_int returned error: " << status; -@@ -676,11 +676,11 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } -- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); -+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_int64 returned error: " << status; -@@ -705,12 +705,12 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); -+ int status = sqlite3_bind_double(this->Statement, index+1, value); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_double returned error: " << status; -@@ -734,12 +734,12 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); -+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_text returned error: " << status; -@@ -763,17 +763,17 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - - int status = -- vtk_sqlite3_bind_blob(this->Statement, -+ sqlite3_bind_blob(this->Statement, - index+1, - data, - length, -- VTK_SQLITE_TRANSIENT); -+ SQLITE_TRANSIENT); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_blob returned error: " << status; -@@ -797,12 +797,12 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_clear_bindings(this->Statement); -+ int status = sqlite3_clear_bindings(this->Statement); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_clear_bindings returned error: " << status; ---- VTK/IO/SQL/vtkSQLiteDatabase.h -+++ VTK/IO/SQL/vtkSQLiteDatabase.h -@@ -49,7 +49,7 @@ - class vtkSQLQuery; - class vtkSQLiteQuery; - class vtkStringArray; --struct vtk_sqlite3; -+struct sqlite3; - - class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase - { -@@ -147,7 +147,7 @@ - virtual bool ParseURL(const char* url); - - private: -- vtk_sqlite3 *SQLiteInstance; -+ sqlite3 *SQLiteInstance; - - // We want this to be private, a user of this class - // should not be setting this for any reason ---- VTK/IO/SQL/vtkSQLiteQuery.h -+++ VTK/IO/SQL/vtkSQLiteQuery.h -@@ -47,7 +47,7 @@ - class vtkSQLiteDatabase; - class vtkVariant; - class vtkVariantArray; --struct vtk_sqlite3_stmt; -+struct sqlite3_stmt; - - class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery - { -@@ -155,7 +155,7 @@ - vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. - void operator=(const vtkSQLiteQuery &); // Not implemented. - -- vtk_sqlite3_stmt *Statement; -+ sqlite3_stmt *Statement; - bool InitialFetch; - int InitialFetchResult; - char *LastErrorText; ---- VTK/ThirdParty/sqlite/CMakeLists.txt -+++ VTK/ThirdParty/sqlite/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(vtksqlite_THIRD_PARTY 1) --set(vtksqlite_LIBRARIES vtksqlite) -+#set(vtksqlite_THIRD_PARTY 1) -+set(vtksqlite_LIBRARIES sqlite3) - vtk_module_export_info() --add_subdirectory(vtksqlite) -+#add_subdirectory(vtksqlite) diff --git a/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch b/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch deleted file mode 100644 index 58ddde97d4f..00000000000 --- a/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ParaView-3.98.0-src/VTK/CMake/FindCg.cmake -+++ ParaView-3.98.0-src/VTK/CMake/FindCg.cmake -@@ -82,6 +82,7 @@ - FIND_PROGRAM( CG_COMPILER cgc - /usr/bin - /usr/local/bin -+ /opt/nvidia-cg-toolkit/bin - DOC "The Cg Compiler" - ) - GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) -@@ -89,6 +90,7 @@ - FIND_PATH( CG_INCLUDE_PATH Cg/cg.h - /usr/include - /usr/local/include -+ /opt/nvidia-cg-toolkit/include - ${CG_COMPILER_SUPER_DIR}/include - DOC "The directory where Cg/cg.h resides" - ) -@@ -98,6 +100,8 @@ - /usr/lib - /usr/local/lib64 - /usr/local/lib -+ /opt/nvidia-cg-toolkit/lib64 -+ /opt/nvidia-cg-toolkit/lib - ${CG_COMPILER_SUPER_DIR}/lib64 - ${CG_COMPILER_SUPER_DIR}/lib - DOC "The Cg runtime library" -@@ -108,6 +112,8 @@ - /usr/lib - /usr/local/lib64 - /usr/local/lib -+ /opt/nvidia-cg-toolkit/lib64 -+ /opt/nvidia-cg-toolkit/lib - ${CG_COMPILER_SUPER_DIR}/lib64 - ${CG_COMPILER_SUPER_DIR}/lib - DOC "The Cg runtime library" diff --git a/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch b/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch deleted file mode 100644 index 65a5b20d60f..00000000000 --- a/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx_orig 2014-01-11 15:02:10.000000000 +0100 -+++ b/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx 2014-11-11 13:12:25.000000000 +0100 -@@ -28,5 +28,5 @@ - // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by - // the system --//#define GLX_GLXEXT_LEGACY -+#define GLX_GLXEXT_LEGACY - #include "GL/glx.h" - diff --git a/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch b/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch deleted file mode 100644 index 531be2f614f..00000000000 --- a/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/VTK/CMake/vtkCompilerExtras.cmake b/VTK/CMake/vtkCompilerExtras.cmake -index 05b2db9..48d9395 100644 ---- a/VTK/CMake/vtkCompilerExtras.cmake -+++ b/VTK/CMake/vtkCompilerExtras.cmake -@@ -15,11 +15,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) - # If we are compiling on Linux then set some extra linker flags too - if(CMAKE_SYSTEM_NAME MATCHES Linux) - set(CMAKE_SHARED_LINKER_FLAGS -- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") -+ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_MODULE_LINKER_FLAGS -- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") -+ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") - set (CMAKE_EXE_LINKER_FLAGS -- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") -+ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") - endif() - - # Now check if we can use visibility to selectively export symbols diff --git a/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch deleted file mode 100644 index b7d3e409cde..00000000000 --- a/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 -+++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 -@@ -1185,7 +1185,7 @@ - if (bitmap) - { - metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); -- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), -+ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), - metaData.descent); - } - ++heightString; -@@ -1952,8 +1952,8 @@ - if (bitmap) - { - bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); -- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); -- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); -+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width)); -+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows)); - bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); - } - else diff --git a/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch b/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch deleted file mode 100644 index 4bc5e546fc9..00000000000 --- a/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=560670 -http://www.paraview.org/Bug/view.php?id=15655 - -diff --git a/Qt/Components/CMakeLists.txt b/Qt/Components/CMakeLists.txt -index c45b4bf..8616a90 100644 ---- a/Qt/Components/CMakeLists.txt -+++ b/Qt/Components/CMakeLists.txt -@@ -650,7 +650,7 @@ vtk_module_library(${vtk-module} - #the pqSGExportStateWizard has subclasses that directly access - #the UI file, and currently we don't have a clean way to break this hard - #dependency, so for no we install this ui file. --if(PARAVIEW_INSTALL_DEVELOPMENT_FILES) -+if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h" - DESTINATION "${VTK_INSTALL_INCLUDE_DIR}") - endif() diff --git a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch deleted file mode 100644 index 6016b8d7337..00000000000 --- a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch +++ /dev/null @@ -1,550 +0,0 @@ -diff --git a/VTK/IO/SQL/CMakeLists.txt b/VTK/IO/SQL/CMakeLists.txt -index a62a0b3..25089d9 100644 ---- a/VTK/IO/SQL/CMakeLists.txt -+++ b/VTK/IO/SQL/CMakeLists.txt -@@ -28,3 +28,4 @@ set_source_files_properties( - ) - - vtk_module_library(vtkIOSQL ${Module_SRCS} ${SQLite_SRCS}) -+target_link_libraries(vtkIOSQL -lsqlite3) -diff --git a/VTK/IO/SQL/module.cmake b/VTK/IO/SQL/module.cmake -index f00bfd0..db7792f 100644 ---- a/VTK/IO/SQL/module.cmake -+++ b/VTK/IO/SQL/module.cmake -@@ -5,7 +5,7 @@ vtk_module(vtkIOSQL - vtkIOCore - PRIVATE_DEPENDS - vtksys -- vtksqlite # We should consider splitting this into a module. -+# vtksqlite # We should consider splitting this into a module. - TEST_DEPENDS - vtkIOLegacy - vtkTestingIOSQL -diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.cxx b/VTK/IO/SQL/vtkSQLiteDatabase.cxx -index 8651670..07acfc2 100644 ---- a/VTK/IO/SQL/vtkSQLiteDatabase.cxx -+++ b/VTK/IO/SQL/vtkSQLiteDatabase.cxx -@@ -29,7 +29,7 @@ - #include <fstream> - #include <sstream> - --#include <vtksqlite/vtk_sqlite3.h> -+#include <sqlite3.h> - - vtkStandardNewMacro(vtkSQLiteDatabase); - -@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char* password, int mode) - } - } - -- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); -+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); - -- if (result != VTK_SQLITE_OK) -+ if (result != SQLITE_OK) - { - vtkDebugMacro(<<"SQLite open() failed. Error code is " - << result << " and message is " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - -- vtk_sqlite3_close(this->SQLiteInstance); -+ sqlite3_close(this->SQLiteInstance); - return false; - } - else -@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close() - } - else - { -- int result = vtk_sqlite3_close(this->SQLiteInstance); -- if (result != VTK_SQLITE_OK) -+ int result = sqlite3_close(this->SQLiteInstance); -+ if (result != SQLITE_OK) - { - vtkWarningMacro(<< "Close(): SQLite returned result code " << result); - } -@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetTables() - if (!status) - { - vtkErrorMacro(<< "GetTables(): Database returned error: " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - query->Delete(); - return this->Tables; - } -@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetRecord(const char *table) - if (!status) - { - vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - query->Delete(); - return NULL; - } -@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const char* URL) - // ---------------------------------------------------------------------- - bool vtkSQLiteDatabase::HasError() - { -- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); -+ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); - } - - const char* vtkSQLiteDatabase::GetLastErrorText() - { -- return vtk_sqlite3_errmsg(this->SQLiteInstance); -+ return sqlite3_errmsg(this->SQLiteInstance); - } -diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.h b/VTK/IO/SQL/vtkSQLiteDatabase.h -index 640355a..3e8cd57 100644 ---- a/VTK/IO/SQL/vtkSQLiteDatabase.h -+++ b/VTK/IO/SQL/vtkSQLiteDatabase.h -@@ -49,7 +49,7 @@ - class vtkSQLQuery; - class vtkSQLiteQuery; - class vtkStringArray; --struct vtk_sqlite3; -+struct sqlite3; - - class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase - { -@@ -147,7 +147,7 @@ protected: - virtual bool ParseURL(const char* url); - - private: -- vtk_sqlite3 *SQLiteInstance; -+ sqlite3 *SQLiteInstance; - - // We want this to be private, a user of this class - // should not be setting this for any reason -diff --git a/VTK/IO/SQL/vtkSQLiteQuery.cxx b/VTK/IO/SQL/vtkSQLiteQuery.cxx -index 31a15f1..ea12405 100644 ---- a/VTK/IO/SQL/vtkSQLiteQuery.cxx -+++ b/VTK/IO/SQL/vtkSQLiteQuery.cxx -@@ -25,7 +25,7 @@ - #include "vtkVariant.h" - #include "vtkVariantArray.h" - --#include <vtksqlite/vtk_sqlite3.h> -+#include <sqlite3.h> - - #include <cassert> - -@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery() - { - this->Statement = NULL; - this->InitialFetch = true; -- this->InitialFetchResult=VTK_SQLITE_DONE; -+ this->InitialFetchResult=SQLITE_DONE; - this->LastErrorText = NULL; - this->TransactionInProgress = false; - } -@@ -61,7 +61,7 @@ vtkSQLiteQuery::~vtkSQLiteQuery() - { - if (this->Database != NULL) - { -- vtk_sqlite3_finalize(this->Statement); -+ sqlite3_finalize(this->Statement); - this->Statement = NULL; - } - } -@@ -128,8 +128,8 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery) - if (this->Statement) - { - vtkDebugMacro(<<"Finalizing old statement"); -- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); -- if (finalizeStatus != VTK_SQLITE_OK) -+ int finalizeStatus = sqlite3_finalize(this->Statement); -+ if (finalizeStatus != SQLITE_OK) - { - vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " - << finalizeStatus); -@@ -148,19 +148,19 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery) - return false; - } - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - const char *unused_statement; - -- int prepareStatus = vtk_sqlite3_prepare_v2(db, -+ int prepareStatus = sqlite3_prepare_v2(db, - this->Query, - static_cast<int>(strlen(this->Query)), - &this->Statement, - &unused_statement); - -- if (prepareStatus != VTK_SQLITE_OK) -+ if (prepareStatus != SQLITE_OK) - { -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " -+ this->SetLastErrorText(sqlite3_errmsg(db)); -+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " - << this->GetLastErrorText() - << " on statement: '" - << this->Query << "'"); -@@ -191,31 +191,31 @@ bool vtkSQLiteQuery::Execute() - } - else - { -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - - vtkDebugMacro(<<"Execute(): Query ready to execute."); - - this->InitialFetch = true; -- int result = vtk_sqlite3_step(this->Statement); -+ int result = sqlite3_step(this->Statement); - this->InitialFetchResult = result; - -- if (result == VTK_SQLITE_DONE) -+ if (result == SQLITE_DONE) - { - this->SetLastErrorText(NULL); - this->Active = true; - return true; - } -- else if (result != VTK_SQLITE_ROW) -+ else if (result != SQLITE_ROW) - { - vtkSQLiteDatabase *dbContainer = - vtkSQLiteDatabase::SafeDownCast(this->Database); - assert(dbContainer != NULL); - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " -+ this->SetLastErrorText(sqlite3_errmsg(db)); -+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " - << this->GetLastErrorText()); - this->Active = false; - return false; -@@ -236,7 +236,7 @@ int vtkSQLiteQuery::GetNumberOfFields() - } - else - { -- return vtk_sqlite3_column_count(this->Statement); -+ return sqlite3_column_count(this->Statement); - } - } - -@@ -256,7 +256,7 @@ const char * vtkSQLiteQuery::GetFieldName(int column) - } - else - { -- return vtk_sqlite3_column_name(this->Statement, column); -+ return sqlite3_column_name(this->Statement, column); - } - } - -@@ -276,22 +276,22 @@ int vtkSQLiteQuery::GetFieldType(int column) - } - else - { -- switch (vtk_sqlite3_column_type(this->Statement, column)) -+ switch (sqlite3_column_type(this->Statement, column)) - { -- case VTK_SQLITE_INTEGER: -+ case SQLITE_INTEGER: - return VTK_INT; -- case VTK_SQLITE_FLOAT: -+ case SQLITE_FLOAT: - return VTK_FLOAT; -- case VTK_SQLITE_TEXT: -+ case SQLITE_TEXT: - return VTK_STRING; -- case VTK_SQLITE_BLOB: -+ case SQLITE_BLOB: - return VTK_STRING; // until we have a BLOB type of our own -- case VTK_SQLITE_NULL: -+ case SQLITE_NULL: - return VTK_VOID; // ??? what makes sense here? - default: - { - vtkErrorMacro(<<"GetFieldType(): Unknown data type " -- << vtk_sqlite3_column_type(this->Statement, column) -+ << sqlite3_column_type(this->Statement, column) - <<" from SQLite."); - return VTK_VOID; - } -@@ -312,7 +312,7 @@ bool vtkSQLiteQuery::NextRow() - { - vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); - this->InitialFetch = false; -- if (this->InitialFetchResult == VTK_SQLITE_DONE) -+ if (this->InitialFetchResult == SQLITE_DONE) - { - return false; - } -@@ -323,12 +323,12 @@ bool vtkSQLiteQuery::NextRow() - } - else - { -- int result = vtk_sqlite3_step(this->Statement); -- if (result == VTK_SQLITE_DONE) -+ int result = sqlite3_step(this->Statement); -+ if (result == SQLITE_DONE) - { - return false; - } -- else if (result == VTK_SQLITE_ROW) -+ else if (result == SQLITE_ROW) - { - return true; - } -@@ -336,8 +336,8 @@ bool vtkSQLiteQuery::NextRow() - { - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -+ sqlite3 *db = dbContainer->SQLiteInstance; -+ this->SetLastErrorText(sqlite3_errmsg(db)); - vtkErrorMacro(<<"NextRow(): Database returned error code " - << result << " with the following message: " - << this->GetLastErrorText()); -@@ -363,33 +363,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtkIdType column) - } - else - { -- switch (vtk_sqlite3_column_type(this->Statement, column)) -+ switch (sqlite3_column_type(this->Statement, column)) - { -- case VTK_SQLITE_INTEGER: -- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); -+ case SQLITE_INTEGER: -+ return vtkVariant(sqlite3_column_int(this->Statement, column)); - -- case VTK_SQLITE_FLOAT: -- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); -+ case SQLITE_FLOAT: -+ return vtkVariant(sqlite3_column_double(this->Statement, column)); - -- case VTK_SQLITE_TEXT: -+ case SQLITE_TEXT: - { - std::ostringstream str; -- str << vtk_sqlite3_column_text(this->Statement, column); -+ str << sqlite3_column_text(this->Statement, column); - return vtkVariant(vtkStdString(str.str())); - } - -- case VTK_SQLITE_BLOB: -+ case SQLITE_BLOB: - { - // This is a hack ... by passing the BLOB to vtkStdString with an explicit - // byte count, we ensure that the string will store all of the BLOB's bytes, - // even if there are NULL values. - - return vtkVariant(vtkStdString( -- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), -- vtk_sqlite3_column_bytes(this->Statement, column))); -+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), -+ sqlite3_column_bytes(this->Statement, column))); - } - -- case VTK_SQLITE_NULL: -+ case SQLITE_NULL: - default: - return vtkVariant(); - } -@@ -420,11 +420,11 @@ bool vtkSQLiteQuery::BeginTransaction() - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = true; - this->SetLastErrorText(NULL); -@@ -448,7 +448,7 @@ bool vtkSQLiteQuery::CommitTransaction() - { - if (this->Statement) - { -- vtk_sqlite3_finalize(this->Statement); -+ sqlite3_finalize(this->Statement); - this->Statement = NULL; - } - -@@ -460,11 +460,11 @@ bool vtkSQLiteQuery::CommitTransaction() - - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = false; - this->SetLastErrorText(NULL); -@@ -496,11 +496,11 @@ bool vtkSQLiteQuery::RollbackTransaction() - - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = false; - this->SetLastErrorText(NULL); -@@ -644,11 +644,11 @@ bool vtkSQLiteQuery::BindIntegerParameter(int index, int value) - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } -- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); -+ int status = sqlite3_bind_int(this->Statement, index+1, value); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - std::ostringstream errormessage; - errormessage << "sqlite_bind_int returned error: " << status; -@@ -673,11 +673,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(int index, vtkTypeInt64 value) - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } -- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); -+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - std::ostringstream errormessage; - errormessage << "sqlite_bind_int64 returned error: " << status; -@@ -702,12 +702,12 @@ bool vtkSQLiteQuery::BindDoubleParameter(int index, double value) - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); -+ int status = sqlite3_bind_double(this->Statement, index+1, value); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - std::ostringstream errormessage; - errormessage << "sqlite_bind_double returned error: " << status; -@@ -731,12 +731,12 @@ bool vtkSQLiteQuery::BindStringParameter(int index, const char *value, int lengt - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); -+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - std::ostringstream errormessage; - errormessage << "sqlite_bind_text returned error: " << status; -@@ -760,17 +760,17 @@ bool vtkSQLiteQuery::BindBlobParameter(int index, const void *data, int length) - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - - int status = -- vtk_sqlite3_bind_blob(this->Statement, -+ sqlite3_bind_blob(this->Statement, - index+1, - data, - length, -- VTK_SQLITE_TRANSIENT); -+ SQLITE_TRANSIENT); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - std::ostringstream errormessage; - errormessage << "sqlite_bind_blob returned error: " << status; -@@ -794,12 +794,12 @@ bool vtkSQLiteQuery::ClearParameterBindings() - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_clear_bindings(this->Statement); -+ int status = sqlite3_clear_bindings(this->Statement); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - std::ostringstream errormessage; - errormessage << "sqlite_clear_bindings returned error: " << status; -diff --git a/VTK/IO/SQL/vtkSQLiteQuery.h b/VTK/IO/SQL/vtkSQLiteQuery.h -index bfab39a..db4deb4 100644 ---- a/VTK/IO/SQL/vtkSQLiteQuery.h -+++ b/VTK/IO/SQL/vtkSQLiteQuery.h -@@ -47,7 +47,7 @@ - class vtkSQLiteDatabase; - class vtkVariant; - class vtkVariantArray; --struct vtk_sqlite3_stmt; -+struct sqlite3_stmt; - - class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery - { -@@ -155,7 +155,7 @@ private: - vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. - void operator=(const vtkSQLiteQuery &); // Not implemented. - -- vtk_sqlite3_stmt *Statement; -+ sqlite3_stmt *Statement; - bool InitialFetch; - int InitialFetchResult; - char *LastErrorText; -diff --git a/VTK/ThirdParty/sqlite/CMakeLists.txt b/VTK/ThirdParty/sqlite/CMakeLists.txt -index 9e1c067..a55764b 100644 ---- a/VTK/ThirdParty/sqlite/CMakeLists.txt -+++ b/VTK/ThirdParty/sqlite/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(vtksqlite_THIRD_PARTY 1) --set(vtksqlite_LIBRARIES vtksqlite) --vtk_module_export_info() --add_subdirectory(vtksqlite) -+#set(vtksqlite_THIRD_PARTY 1) -+#set(vtksqlite_LIBRARIES sqlite3) -+#vtk_module_export_info() -+#add_subdirectory(vtksqlite) -diff --git a/VTK/ThirdParty/sqlite/module.cmake b/VTK/ThirdParty/sqlite/module.cmake -index 8dbb3a7..db837c5 100644 ---- a/VTK/ThirdParty/sqlite/module.cmake -+++ b/VTK/ThirdParty/sqlite/module.cmake -@@ -1 +1 @@ --vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING) -+#vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING) diff --git a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild deleted file mode 100644 index 2478621dbd2..00000000000 --- a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils multilib versionator python-single-r1 cmake-utils - -MAIN_PV=$(get_major_version) -MAJOR_PV=$(get_version_component_range 1-2) -MY_P="ParaView-v${PV}-source" - -DESCRIPTION="ParaView is a powerful scientific data visualization application" -HOMEPAGE="http://www.paraview.org"; -SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"; -RESTRICT="mirror" - -LICENSE="paraview GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk" -RESTRICT="test" - -REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} ) - mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" - -RDEPEND=" - dev-libs/expat - dev-libs/jsoncpp - dev-libs/libxml2:2 - <dev-libs/protobuf-2.6 - media-libs/freetype - media-libs/libpng:0 - media-libs/libtheora - media-libs/tiff:0= - sci-libs/hdf5[mpi=] - >=sci-libs/netcdf-4.2[hdf5] - >=sci-libs/netcdf-cxx-4.2:3 - sys-libs/zlib - virtual/jpeg:0 - virtual/opengl - >=x11-libs/gl2ps-1.3.8 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) - coprocessing? ( - plugins? ( - dev-python/PyQt4 - dev-qt/qtgui:4 - ) - ) - ffmpeg? ( virtual/ffmpeg ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( virtual/mysql ) - python? ( - ${PYTHON_DEPS} - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - dev-python/twisted-core[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) - qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] ) - ) - qt4? ( - dev-qt/designer:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qthelp:4[compat] - dev-qt/qtsql:4 - dev-qt/qtwebkit:4 - ) - sqlite? ( dev-db/sqlite:3 ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -S=${WORKDIR}/${MY_P%-source} - -pkg_setup() { - python-single-r1_pkg_setup - PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -} - -src_prepare() { - # see patch headers for description - epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ - "${FILESDIR}"/${PN}-4.0.1-removesqlite.patch \ - "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ - "${FILESDIR}"/${PN}-4.0.1-vtk-cg-path.patch \ - "${FILESDIR}"/${PN}-4.0.1-Protobuf.patch \ - "${FILESDIR}"/${P}-glxext-legacy.patch \ - "${FILESDIR}"/${P}-no-fatal-warnings.patch \ - "${FILESDIR}"/${P}-vtk-freetype.patch - - # lib64 fixes - sed -i \ - -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die - sed -i \ - -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ - VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die - sed -i \ - -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ - CMakeLists.txt \ - Plugins/SciberQuestToolKit/CMakeLists.txt \ - ParaViewConfig.cmake.in \ - CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \ - ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \ - ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \ - Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \ - Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die - - # no proper switch - use nvcontrol || { - sed -i \ - -e '/VTK_USE_NVCONTROL/s#1#0#' \ - VTK/Rendering/OpenGL/CMakeLists.txt || die - } -} - -src_configure() { - local mysql_lib mysql_includedir - - if use mysql ; then - if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then - mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" - mysql_includedir="/usr/include/mysql" - else - mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" - mysql_includedir="$(mysql_config --variable=pkgincludedir)" - fi - fi - - # TODO: use system jsoncpp - # VTK_USE_SYSTEM_QTTESTING - # PARAVIEW_USE_SYSTEM_AUTOBAHN - local mycmakeargs=( - -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include - -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so - -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DBUILD_SHARED_LIBS=ON - -DVTK_USE_SYSTEM_EXPAT=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_GL2PS=ON - -DVTK_USE_SYSTEM_HDF5=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_JSONCPP=ON - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_SYSTEM_NETCDF=ON - -DVTK_USE_SYSTEM_OGGTHEORA=ON - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_PROTOBUF=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_XDMF2=OFF - -DVTK_USE_SYSTEM_ZLIB=ON - -DPARAVIEW_USE_SYSTEM_MPI4PY=ON - -DVTK_USE_SYSTEM_ZOPE=ON - -DVTK_USE_SYSTEM_TWISTED=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_COLOR_MAKEFILE=TRUE - -DVTK_USE_OFFSCREEN=TRUE - -DCMAKE_USE_PTHREADS=ON - -DVTK_USE_FFMPEG_ENCODER=OFF - -DPROTOC_LOCATION=$(type -P protoc) - -DVTK_Group_StandAlone=ON - -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" - -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" - # force this module due to incorrect build system deps - # wrt bug 460528 - -DModule_vtkUtilitiesProcessXML=ON - ) - - # TODO: XDMF_USE_MYSQL? - # VTK_WRAP_JAVA - mycmakeargs+=( - $(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES) - $(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI) - $(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL) - $(cmake-utils_use qt4 Module_vtkGUISupportQtSQL) - $(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit) - $(cmake-utils_use qt4 Module_vtkRenderingQt) - $(cmake-utils_use qt4 Module_vtkViewsQt) - $(cmake-utils_use qt4 VTK_Group_ParaViewQt) - $(cmake-utils_use qt4 VTK_Group_Qt) - $(cmake-utils_use !qt4 PQWIDGETS_DISABLE_QTWEBKIT) - $(cmake-utils_use boost Module_vtkInfovisBoost) - $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) - $(cmake-utils_use mpi PARAVIEW_USE_MPI) - $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) - $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) - $(cmake-utils_use mpi VTK_Group_MPI) - $(cmake-utils_use mpi VTK_XDMF_USE_MPI) - $(cmake-utils_use mpi XDMF_BUILD_MPI) - $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) - $(cmake-utils_use python VTK_Group_ParaViewPython) - $(cmake-utils_use python XDMF_WRAP_PYTHON) - $(cmake-utils_use python Module_vtkPython) - $(cmake-utils_use python Module_pqPython) - $(cmake-utils_use python Module_vtkWrappingPythonCore) - $(cmake-utils_use python Module_vtkPVPythonSupport) - $(cmake-utils_use python Module_AutobahnPython) - $(cmake-utils_use python Module_Twisted) - $(cmake-utils_use python Module_ZopeInterface) - $(cmake-utils_use python Module_vtkmpi4py) - $(usex qt4 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF") - $(cmake-utils_use doc BUILD_DOCUMENTATION) - $(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION) - $(cmake-utils_use examples BUILD_EXAMPLES) - $(cmake-utils_use cg VTK_USE_CG_SHADERS) - $(cmake-utils_use mysql Module_vtkIOMySQL) - $(cmake-utils_use sqlite Module_vtksqlite) - $(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST) - $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) - $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) - $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) - $(cmake-utils_use tk VTK_Group_Tk) - $(cmake-utils_use tk VTK_USE_TK) - $(cmake-utils_use tk Module_vtkRenderingTk) - $(cmake-utils_use tcl Module_vtkTclTk) - $(cmake-utils_use tcl Module_vtkWrappingTcl) - $(cmake-utils_use test BUILD_TESTING) - ) - - if use qt4 ; then - mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) - if use python ; then - # paraview cannot guess sip directory properly - mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) - fi - fi - - # TODO: MantaView VaporPlugin VRPlugin - mycmakeargs+=( - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) - $(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering) - # these are always needed for plugins - $(cmake-utils_use plugins Module_vtkFiltersFlowPaths) - $(cmake-utils_use plugins Module_vtkPVServerManagerApplication) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} - - newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png - make_desktop_entry paraview "Paraview" paraview - - use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} -} - -pkg_postinst() { - # with Qt4.5 there seem to be issues reading data files - # under certain locales. Setting LC_ALL=C should fix these. - elog "" - elog "If you experience data corruption during parsing of" - elog "data files with paraview please try setting your" - elog "locale to LC_ALL=C." - elog "If you plan to use paraview component from an existing shell" - elog "you should run env-update and . /etc/profile first" - elog "" - elog "paraview no longer exports bundled python modules in PYTHONPATH" - elog "globally due to clashes of bundled packages with system-wide" - elog "site-packages. If you want to use paraview's python modules" - elog "export" - elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" - elog "as needed." -} diff --git a/sci-visualization/paraview/paraview-5.1.2-r1.ebuild b/sci-visualization/paraview/paraview-5.1.2-r1.ebuild deleted file mode 100644 index cecb858d41a..00000000000 --- a/sci-visualization/paraview/paraview-5.1.2-r1.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator - -MAIN_PV=$(get_major_version) -MAJOR_PV=$(get_version_component_range 1-2) -MY_P="ParaView-v${PV}" - -DESCRIPTION="ParaView is a powerful scientific data visualization application" -HOMEPAGE="http://www.paraview.org"; -SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"; -RESTRICT="mirror" - -LICENSE="paraview GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk" -RESTRICT="test" - -REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} ) - mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" - -RDEPEND=" - dev-libs/expat - <dev-libs/jsoncpp-1.7.5 - dev-libs/libxml2:2 - dev-libs/protobuf - media-libs/freetype - media-libs/libpng:0 - media-libs/libtheora - media-libs/tiff:0= - sci-libs/hdf5[mpi=] - >=sci-libs/netcdf-4.2[hdf5] - >=sci-libs/netcdf-cxx-4.2:3 - sys-libs/zlib - virtual/jpeg:0 - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - coprocessing? ( - plugins? ( - dev-python/PyQt5 - dev-qt/qtgui:5[-gles2] - ) - ) - ffmpeg? ( virtual/ffmpeg ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( virtual/mysql ) - python? ( - ${PYTHON_DEPS} - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - dev-python/twisted-core - dev-python/zope-interface[${PYTHON_USEDEP}] - mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] ) - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtgui:5[-gles2] - dev-qt/qthelp:5 - dev-qt/qtopengl:5[-gles2] - dev-qt/qtsql:5 - dev-qt/qttest:5 - dev-qt/qtwebkit:5 - dev-qt/qtx11extras:5 - ) - sqlite? ( dev-db/sqlite:3 ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=dev-util/cmake-3.4 - boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) - doc? ( app-doc/doxygen )" - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then - eerror "For USE=openmp a gcc with openmp support is required" - eerror - return 1 - fi -} - -pkg_setup() { - python-single-r1_pkg_setup - PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -} - -src_prepare() { - # see patch headers for description - epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ - "${FILESDIR}"/${PN}-4.3.1-fix-development-install.patch \ - "${FILESDIR}"/${PN}-4.4.0-removesqlite.patch - - # lib64 fixes - sed -i \ - -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die - sed -i \ - -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ - VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die - sed -i \ - -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ - CMakeLists.txt \ - Plugins/SciberQuestToolKit/CMakeLists.txt \ - ParaViewConfig.cmake.in \ - CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \ - ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \ - ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \ - Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \ - Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die - - # no proper switch - use nvcontrol || { - sed -i \ - -e '/VTK_USE_NVCONTROL/s#1#0#' \ - VTK/Rendering/OpenGL/CMakeLists.txt || die - } -} - -src_configure() { - if use qt5; then - export QT_SELECT=qt5 - fi - - # VTK_USE_SYSTEM_QTTESTING - # PARAVIEW_USE_SYSTEM_AUTOBAHN - local mycmakeargs=( - -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include - -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so - -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DBUILD_SHARED_LIBS=ON - -DCMAKE_COLOR_MAKEFILE=TRUE - -DCMAKE_USE_PTHREADS=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - -DPARAVIEW_USE_SYSTEM_MPI4PY=ON - -DPROTOC_LOCATION=$(type -P protoc) - -DVTK_Group_StandAlone=ON - -DVTK_RENDERING_BACKEND=OpenGL2 - -DVTK_USE_FFMPEG_ENCODER=OFF - -DVTK_USE_OFFSCREEN=TRUE - -DVTK_USE_SYSTEM_EXPAT=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_GL2PS=OFF - -DVTK_USE_SYSTEM_HDF5=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_JSONCPP=ON - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_SYSTEM_NETCDF=ON - -DVTK_USE_SYSTEM_OGGTHEORA=ON - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_PROTOBUF=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_TWISTED=ON - -DVTK_USE_SYSTEM_XDMF2=OFF - -DVTK_USE_SYSTEM_ZLIB=ON - -DVTK_USE_SYSTEM_ZOPE=ON - # force this module due to incorrect build system deps - # wrt bug 460528 - -DModule_vtkUtilitiesProcessXML=ON - ) - - # TODO: XDMF_USE_MYSQL? - # VTK_WRAP_JAVA - mycmakeargs+=( - $(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES) - $(cmake-utils_use qt5 PARAVIEW_BUILD_QT_GUI) - $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "") - $(cmake-utils_use qt5 Module_vtkGUISupportQtOpenGL) - $(cmake-utils_use qt5 Module_vtkGUISupportQtSQL) - $(cmake-utils_use qt5 Module_vtkGUISupportQtWebkit) - $(cmake-utils_use qt5 Module_vtkRenderingQt) - $(cmake-utils_use qt5 Module_vtkViewsQt) - $(cmake-utils_use qt5 VTK_Group_ParaViewQt) - $(cmake-utils_use qt5 VTK_Group_Qt) - $(cmake-utils_use !qt5 PQWIDGETS_DISABLE_QTWEBKIT) - $(cmake-utils_use boost Module_vtkInfovisBoost) - $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) - $(cmake-utils_use mpi PARAVIEW_USE_MPI) - $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) - $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) - $(cmake-utils_use mpi VTK_Group_MPI) - $(cmake-utils_use mpi VTK_XDMF_USE_MPI) - $(cmake-utils_use mpi XDMF_BUILD_MPI) - $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) - $(cmake-utils_use python VTK_Group_ParaViewPython) - $(cmake-utils_use python XDMF_WRAP_PYTHON) - $(cmake-utils_use python Module_vtkPython) - $(cmake-utils_use python Module_pqPython) - $(cmake-utils_use python Module_vtkWrappingPythonCore) - $(cmake-utils_use python Module_vtkPVPythonSupport) - $(cmake-utils_use python Module_AutobahnPython) - $(cmake-utils_use python Module_Twisted) - $(cmake-utils_use python Module_ZopeInterface) - $(cmake-utils_use python Module_vtkmpi4py) - $(usex qt5 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF") - $(cmake-utils_use doc BUILD_DOCUMENTATION) - $(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION) - $(cmake-utils_use examples BUILD_EXAMPLES) - $(cmake-utils_use cg VTK_USE_CG_SHADERS) - $(cmake-utils_use mysql Module_vtkIOMySQL) - $(cmake-utils_use sqlite Module_vtksqlite) - $(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST) - $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) - $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) - $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) - $(cmake-utils_use tk VTK_Group_Tk) - $(cmake-utils_use tk VTK_USE_TK) - $(cmake-utils_use tk Module_vtkRenderingTk) - $(cmake-utils_use tcl Module_vtkTclTk) - $(cmake-utils_use tcl Module_vtkWrappingTcl) - $(cmake-utils_use test BUILD_TESTING) - ) - - if use openmp; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) - fi - - if use qt5 ; then - mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) - if use python ; then - # paraview cannot guess sip directory properly - mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) - fi - fi - - # TODO: MantaView VaporPlugin VRPlugin - mycmakeargs+=( - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) - $(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering) - # these are always needed for plugins - $(cmake-utils_use plugins Module_vtkFiltersFlowPaths) - $(cmake-utils_use plugins Module_vtkPVServerManagerApplication) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} - - newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png - make_desktop_entry paraview "Paraview" paraview - - use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} -}
