* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2015-09-20 3:04 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2015-09-20 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 781fdf38053da604fcb269c354ad3cd86bd0e0ec
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 03:03:17 2015 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 03:04:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781fdf38
sci-visualization/paraview: Only keep version 4.3.1
Package-Manager: portage-2.2.20.1
sci-visualization/paraview/Manifest | 2 -
.../paraview/files/paraview-4.0.1-Protobuf.patch | 72 ---
.../files/paraview-4.0.1-removesqlite.patch | 517 ---------------------
.../files/paraview-4.0.1-vtk-cg-path.patch | 36 --
.../paraview/files/paraview-4.0.1-vtknetcd.patch | 79 ----
.../files/paraview-4.1.0-glxext-legacy.patch | 9 -
.../files/paraview-4.1.0-vtk-freetype.patch | 22 -
.../paraview/paraview-4.1.0-r2.ebuild | 302 ------------
.../paraview/paraview-4.2.0-r1.ebuild | 300 ------------
9 files changed, 1339 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 98844ec..0ce9e37 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-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7
DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
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 6a09a1a..0000000
--- 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-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch
deleted file mode 100644
index be495b4..0000000
--- 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 <mathieu.malaterre@gmail.com>
-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 58ddde9..0000000
--- 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.0.1-vtknetcd.patch b/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
deleted file mode 100644
index a478b7d..0000000
--- a/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch
-
---- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
-@@ -1,8 +1,8 @@
--set(vtknetcdf_THIRD_PARTY 1)
--set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
--set(vtknetcdf_INCLUDE_DIRS
-- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-- ${vtknetcdf_BINARY_DIR}/vtknetcdf
-- )
-+#set(vtknetcdf_THIRD_PARTY 1)
-+set(vtknetcdf_LIBRARIES netcdf netcdf_c++)
-+#set(vtknetcdf_INCLUDE_DIRS
-+# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-+# ${vtknetcdf_BINARY_DIR}/vtknetcdf
-+# )
- vtk_module_export_info()
--add_subdirectory(vtknetcdf)
-+#add_subdirectory(vtknetcdf)
---- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
-@@ -16,6 +16,6 @@
- #define __vtk_netcdf_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/include/netcdf.h>
-+#include <netcdf.h>
-
- #endif
---- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
-@@ -16,6 +16,6 @@
- #define __vtk_netcdfcpp_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/cxx/netcdfcpp.h>
-+#include <netcdfcpp.h>
-
- #endif
---- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
-@@ -21,7 +21,7 @@
- )
-
- add_executable(ExoIICTests ${ExoIICTests})
--target_link_libraries(ExoIICTests vtkCommon vtkexoIIc vtkNetCDF)
-+target_link_libraries(ExoIICTests vtkCommon vtkexoIIc netcdf)
-
- set(TestsToRun ${ExoIICTests})
- remove(TestsToRun ExoIICTests.cxx)
---- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-@@ -241,7 +241,7 @@
-
-
- VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
--TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
-+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
-
- IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
- # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
---- ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
-@@ -10,5 +10,5 @@
-
- vtk_module_library(vtkIONetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIONetCDF netcdf netcdf_c++)
- set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
---- ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
-@@ -8,4 +8,4 @@
-
- vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIOParallelNetCDF netcdf netcdf_c++)
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 65a5b20..0000000
--- 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-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch
deleted file mode 100644
index b7d3e40..0000000
--- 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/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
deleted file mode 100644
index 20bed18..0000000
--- a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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? ( ${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-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
deleted file mode 100644
index 7777925..0000000
--- a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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? ( ${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}"
-
-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}"/${P}-removesqlite.patch \
- "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
- "${FILESDIR}"/${P}-protobuf.patch \
- "${FILESDIR}"/${PN}-4.1.0-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-32x32.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."
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2015-09-20 4:02 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2015-09-20 4:02 UTC (permalink / raw
To: gentoo-commits
commit: 2d35dd5128f6e72d52a9077aad9614b5d1d12efa
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 03:25:16 2015 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 03:25:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d35dd51
sci-visualization/paraview: Version bump to 4.4.0
Package-Manager: portage-2.2.20.1
sci-visualization/paraview/Manifest | 1 +
.../files/paraview-4.4.0-removesqlite.patch | 550 +++++++++++++++++++++
sci-visualization/paraview/paraview-4.4.0.ebuild | 300 +++++++++++
3 files changed, 851 insertions(+)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 0ce9e37..011c260 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1 +1,2 @@
DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
+DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
diff --git a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch
new file mode 100644
index 0000000..6016b8d
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch
@@ -0,0 +1,550 @@
+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.4.0.ebuild b/sci-visualization/paraview/paraview-4.4.0.ebuild
new file mode 100644
index 0000000..21ac4ab
--- /dev/null
+++ b/sci-visualization/paraview/paraview-4.4.0.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( ${PYTHON_REQUIRED_USE} )
+ mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+
+RDEPEND="
+ dev-libs/expat
+ >=dev-libs/jsoncpp-0.10.1
+ 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
+ >=x11-libs/gl2ps-1.3.8
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ 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
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ mpi? ( dev-python/mpi4py )
+ 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}
+ ${PYTHON_DEPS}
+ boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+ doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+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-gcc-4.7.patch \
+ "${FILESDIR}"/${PN}-4.2.0-protobuf.patch \
+ "${FILESDIR}"/${PN}-4.3.1-fix-development-install.patch \
+ "${FILESDIR}"/${PN}-4.3.1-protobuf-2.6.patch \
+ "${FILESDIR}"/${P}-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() {
+ 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
+
+ # 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-32x32.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."
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2015-09-20 6:56 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2015-09-20 6:56 UTC (permalink / raw
To: gentoo-commits
commit: 96b0c167e73c6230e4e77336b9e8bb602a8c5c04
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 06:53:39 2015 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 06:56:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b0c167
Revert "sci-visualization/paraview: Only keep version 4.3.1"
This reverts commit 781fdf38053da604fcb269c354ad3cd86bd0e0ec.
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-visualization/paraview/Manifest | 2 +
.../paraview/files/paraview-4.0.1-Protobuf.patch | 72 +++
.../files/paraview-4.0.1-removesqlite.patch | 517 +++++++++++++++++++++
.../files/paraview-4.0.1-vtk-cg-path.patch | 36 ++
.../paraview/files/paraview-4.0.1-vtknetcd.patch | 79 ++++
.../files/paraview-4.1.0-glxext-legacy.patch | 9 +
.../files/paraview-4.1.0-vtk-freetype.patch | 22 +
.../paraview/paraview-4.1.0-r2.ebuild | 302 ++++++++++++
.../paraview/paraview-4.2.0-r1.ebuild | 300 ++++++++++++
9 files changed, 1339 insertions(+)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 011c260..4b660f9 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,2 +1,4 @@
+DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
+DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7
DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch
new file mode 100644
index 0000000..6a09a1a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch
@@ -0,0 +1,72 @@
+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-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch
new file mode 100644
index 0000000..be495b4
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch
@@ -0,0 +1,517 @@
+Description: Import patch from VTK to remove sqlite
+Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
+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
new file mode 100644
index 0000000..58ddde9
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch
@@ -0,0 +1,36 @@
+--- 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.0.1-vtknetcd.patch b/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
new file mode 100644
index 0000000..a478b7d
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
@@ -0,0 +1,79 @@
+adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch
+
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
+@@ -1,8 +1,8 @@
+-set(vtknetcdf_THIRD_PARTY 1)
+-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
+-set(vtknetcdf_INCLUDE_DIRS
+- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
+- ${vtknetcdf_BINARY_DIR}/vtknetcdf
+- )
++#set(vtknetcdf_THIRD_PARTY 1)
++set(vtknetcdf_LIBRARIES netcdf netcdf_c++)
++#set(vtknetcdf_INCLUDE_DIRS
++# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
++# ${vtknetcdf_BINARY_DIR}/vtknetcdf
++# )
+ vtk_module_export_info()
+-add_subdirectory(vtknetcdf)
++#add_subdirectory(vtknetcdf)
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdf_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/include/netcdf.h>
++#include <netcdf.h>
+
+ #endif
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
+@@ -16,6 +16,6 @@
+ #define __vtk_netcdfcpp_h
+
+ /* Use the netcdf library configured for VTK. */
+-#include <vtknetcdf/cxx/netcdfcpp.h>
++#include <netcdfcpp.h>
+
+ #endif
+--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ )
+
+ add_executable(ExoIICTests ${ExoIICTests})
+-target_link_libraries(ExoIICTests vtkCommon vtkexoIIc vtkNetCDF)
++target_link_libraries(ExoIICTests vtkCommon vtkexoIIc netcdf)
+
+ set(TestsToRun ${ExoIICTests})
+ remove(TestsToRun ExoIICTests.cxx)
+--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+@@ -241,7 +241,7 @@
+
+
+ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
+-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
+
+ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
+ # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
+--- ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
+@@ -10,5 +10,5 @@
+
+ vtk_module_library(vtkIONetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIONetCDF netcdf netcdf_c++)
+ set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
+--- ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
++++ ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
+@@ -8,4 +8,4 @@
+
+ vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
+
+-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
++target_link_libraries(vtkIOParallelNetCDF netcdf netcdf_c++)
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
new file mode 100644
index 0000000..65a5b20
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch
@@ -0,0 +1,9 @@
+--- 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-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch
new file mode 100644
index 0000000..b7d3e40
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch
@@ -0,0 +1,22 @@
+--- 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/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
new file mode 100644
index 0000000..20bed18
--- /dev/null
+++ b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( ${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-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
new file mode 100644
index 0000000..7777925
--- /dev/null
+++ b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( ${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}"
+
+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}"/${P}-removesqlite.patch \
+ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
+ "${FILESDIR}"/${P}-protobuf.patch \
+ "${FILESDIR}"/${PN}-4.1.0-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-32x32.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."
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2015-09-21 21:36 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2015-09-21 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 3dcb8854a1862b2b215bad47782f184b8f3f6a39
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 21:35:02 2015 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 21:35:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcb8854
sci-visualization/paraview: drop version 4.2.0-r1
Package-Manager: portage-2.2.20.1
sci-visualization/paraview/Manifest | 1 -
.../paraview/files/paraview-4.0.1-vtknetcd.patch | 79 ------
.../paraview/paraview-4.2.0-r1.ebuild | 300 ---------------------
3 files changed, 380 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 4b660f9..f97d7ed 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,4 +1,3 @@
DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
-DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7
DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch b/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
deleted file mode 100644
index a478b7d..0000000
--- a/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch
-
---- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
-@@ -1,8 +1,8 @@
--set(vtknetcdf_THIRD_PARTY 1)
--set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
--set(vtknetcdf_INCLUDE_DIRS
-- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-- ${vtknetcdf_BINARY_DIR}/vtknetcdf
-- )
-+#set(vtknetcdf_THIRD_PARTY 1)
-+set(vtknetcdf_LIBRARIES netcdf netcdf_c++)
-+#set(vtknetcdf_INCLUDE_DIRS
-+# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-+# ${vtknetcdf_BINARY_DIR}/vtknetcdf
-+# )
- vtk_module_export_info()
--add_subdirectory(vtknetcdf)
-+#add_subdirectory(vtknetcdf)
---- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
-@@ -16,6 +16,6 @@
- #define __vtk_netcdf_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/include/netcdf.h>
-+#include <netcdf.h>
-
- #endif
---- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
-@@ -16,6 +16,6 @@
- #define __vtk_netcdfcpp_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/cxx/netcdfcpp.h>
-+#include <netcdfcpp.h>
-
- #endif
---- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
-@@ -21,7 +21,7 @@
- )
-
- add_executable(ExoIICTests ${ExoIICTests})
--target_link_libraries(ExoIICTests vtkCommon vtkexoIIc vtkNetCDF)
-+target_link_libraries(ExoIICTests vtkCommon vtkexoIIc netcdf)
-
- set(TestsToRun ${ExoIICTests})
- remove(TestsToRun ExoIICTests.cxx)
---- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-@@ -241,7 +241,7 @@
-
-
- VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
--TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
-+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
-
- IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
- # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
---- ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
-@@ -10,5 +10,5 @@
-
- vtk_module_library(vtkIONetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIONetCDF netcdf netcdf_c++)
- set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
---- ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt
-@@ -8,4 +8,4 @@
-
- vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIOParallelNetCDF netcdf netcdf_c++)
diff --git a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
deleted file mode 100644
index 7777925..0000000
--- a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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? ( ${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}"
-
-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}"/${P}-removesqlite.patch \
- "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \
- "${FILESDIR}"/${P}-protobuf.patch \
- "${FILESDIR}"/${PN}-4.1.0-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-32x32.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."
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2016-07-09 18:57 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2016-07-09 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 941b4a90ddb5b32021782dc2f4239abf2dd8da46
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 17:17:35 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 18:57:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941b4a90
sci-visualization/paraview: remove old versions
Package-Manager: portage-2.2.28
sci-visualization/paraview/Manifest | 2 -
.../paraview/files/paraview-4.0.1-Protobuf.patch | 72 ---
.../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 -
.../files/paraview-4.2.0-removesqlite.patch | 541 ---------------------
.../files/paraview-4.2.0-vtk-freetype.patch | 22 -
.../paraview/paraview-4.1.0-r2.ebuild | 302 ------------
sci-visualization/paraview/paraview-4.3.1.ebuild | 288 -----------
11 files changed, 1830 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index f97d7ed..3b515b6 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-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
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 6a09a1a..0000000
--- 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-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch
deleted file mode 100644
index be495b4..0000000
--- 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 <mathieu.malaterre@gmail.com>
-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 58ddde9..0000000
--- 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 65a5b20..0000000
--- 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 531be2f..0000000
--- 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 b7d3e40..0000000
--- 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.2.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.2.0-removesqlite.patch
deleted file mode 100644
index 9861962..0000000
--- a/sci-visualization/paraview/files/paraview-4.2.0-removesqlite.patch
+++ /dev/null
@@ -1,541 +0,0 @@
-Description: Import patch from VTK to remove sqlite
-Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
-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)
--vtk_module_export_info()
--add_subdirectory(vtksqlite)
-+#set(vtksqlite_THIRD_PARTY 1)
-+#set(vtksqlite_LIBRARIES sqlite3)
-+#vtk_module_export_info()
-+#add_subdirectory(vtksqlite)
---- VTK/ThirdParty/sqlite/module.cmake
-+++ VTK/ThirdParty/sqlite/module.cmake
-@@ -1 +1 @@
--vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)
-+#vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)
---- VTK/IO/SQL/module.cmake
-+++ VTK/IO/SQL/module.cmake
-@@ -5,7 +5,7 @@
- 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
---- VTK/IO/SQL/CMakeLists.txt
-+++ VTK/IO/SQL/CMakeLists.txt
-@@ -28,3 +28,4 @@
- )
-
- vtk_module_library(vtkIOSQL ${Module_SRCS} ${SQLite_SRCS})
-+target_link_libraries(vtkIOSQL -lsqlite3)
diff --git a/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch
deleted file mode 100644
index b7d3e40..0000000
--- a/sci-visualization/paraview/files/paraview-4.2.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/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
deleted file mode 100644
index 20bed18..0000000
--- a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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? ( ${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-4.3.1.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild
deleted file mode 100644
index c9a1b26..0000000
--- a/sci-visualization/paraview/paraview-4.3.1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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? ( ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-
-RDEPEND="
- dev-libs/expat
- >=dev-libs/jsoncpp-0.10.1
- 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
- >=x11-libs/gl2ps-1.3.8
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- 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
- dev-python/zope-interface[${PYTHON_USEDEP}]
- mpi? ( dev-python/mpi4py )
- 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}
- ${PYTHON_DEPS}
- boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-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-gcc-4.7.patch \
- "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \
- "${FILESDIR}"/${PN}-4.2.0-protobuf.patch \
- "${FILESDIR}"/${PN}-4.2.0-removesqlite.patch \
- "${FILESDIR}"/${PN}-4.2.0-vtk-freetype.patch \
- "${FILESDIR}"/${P}-protobuf-2.6.patch \
- "${FILESDIR}"/${P}-fix-development-install.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() {
- # 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
- # 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-32x32.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."
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2016-09-22 12:47 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2016-09-22 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 9bff88b6adfc72d4698ef6b00de09bfb86052f0a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 12:45:13 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 12:47:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bff88b6
sci-visualization/paraview: remove old versions < 5.1.2
Package-Manager: portage-2.2.28
sci-visualization/paraview/Manifest | 3 -
.../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/files/paraview-4.2.0-protobuf.patch | 39 --
.../files/paraview-4.3.1-protobuf-2.6.patch | 177 -------
.../paraview-5.1.0-only-require-cmake-3.3.patch | 13 -
.../paraview/paraview-4.1.0-r2.ebuild | 302 ------------
sci-visualization/paraview/paraview-4.4.0.ebuild | 286 ------------
.../paraview/paraview-5.1.0-r1.ebuild | 274 -----------
14 files changed, 1797 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 897fb95..7e51626 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,4 +1 @@
-DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
-DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
-DIST ParaView-v5.1.0.tar.gz 51613148 SHA256 1ce345e9c5533c2854ad7e89cf4f90992bafee23707ae9f85d12b38405169f2a SHA512 c9af27d8be03783c7353735718a41ee03732db0f2e4f6e2db5e1e72d3df01801bb77294713c2b96eaf17e75d1fd6a30e340b3c33f496f7e705d07badfa196e69 WHIRLPOOL 08cd669f02fd54b7fc4054f23f04a3dc274e4ba8ebdf54fb14caaa95bc0c9fb2e2e5551a9e74d88062f2230eb511b7e18d6cb75bb43f4291e19dbaa2ed53cd1f
DIST ParaView-v5.1.2.tar.gz 51635420 SHA256 ff02b7307a256b7c6e8ad900dee5796297494df7f9a0804fe801eb2f66e6a187 SHA512 9204732ecbe5048c96536a2d63f37ec51f331416bab11c982797d07cd0233e1424193d1c8cac6dfe7e91696997f8aaf92c3a32d7b05674c0b176d93444672e40 WHIRLPOOL 1bbb95672279317304dde1f3123a51f3ca787f0f0b1a28ce09e53f0fbfdf685da89efeb2b13c0409982cbc5566e3984542eeeb519aa757bdd849186135c57a64
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 6a09a1a..00000000
--- 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 1b941cf..00000000
--- 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 <malat@debian.org>
-Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208
-Reviewed-by: Anton Gladky <gladky.anton@gmail.com>
-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 be495b4..00000000
--- 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 <mathieu.malaterre@gmail.com>
-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 58ddde9..00000000
--- 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 65a5b20..00000000
--- 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 531be2f..00000000
--- 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 b7d3e40..00000000
--- 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.2.0-protobuf.patch b/sci-visualization/paraview/files/paraview-4.2.0-protobuf.patch
deleted file mode 100644
index 498ad9b..00000000
--- a/sci-visualization/paraview/files/paraview-4.2.0-protobuf.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://paraview.org/Bug/view.php?id=13656
-
----
- ParaViewCore/ServerImplementation/Core/CMakeLists.txt | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/ParaViewCore/ServerImplementation/Core/CMakeLists.txt b/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
-index 5ca5168..2a7ff4b 100644
---- a/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
-+++ b/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
-@@ -82,15 +82,23 @@ set (${vtk-module}_HDRS
- #------------------------------------------------------------------------------
- # Generate the protbuf message file.
- #------------------------------------------------------------------------------
-+if (VTK_USE_SYSTEM_PROTOBUF)
-+ set (_PROTOC_COMPILER protoc)
-+ set (_PROTOC_DEPEND "")
-+else()
-+ set (_PROTOC_COMPILER protoc_compiler)
-+ set (_PROTOC_DEPEND ${_PROTOC_COMPILER})
-+endif()
-+
- 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}
- )
-
---
-2.0.5
-
diff --git a/sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch b/sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch
deleted file mode 100644
index 5a7871f..00000000
--- a/sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-https://gitlab.kitware.com/ben.boeckel/paraview/commit/40a62e0bd20ceb73d7a545dab73e975fa07cddbb
-http://www.vtk.org/Bug/view.php?id=15442#c34997
-
-https://bugs.gentoo.org/show_bug.cgi?id=537988
-
-This updates the *.proto files to be compatible with version 2.6 and fixes
-a bug that prevented successful compilation with protobuf 2.6.
-
---- a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto
-+++ b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto
-@@ -21,7 +21,7 @@ message Variant {
- MAP = 7;
- }
-
-- required Type type = 1;
-+ optional Type type = 1;
- repeated sint64 idtype = 3;
- repeated sint32 integer = 4;
- repeated double float64 = 5;
-@@ -47,8 +47,8 @@ message MessageCollection
-
- message Message
- {
-- required uint64 global_id = 1;
-- required uint32 location = 2;
-+ optional uint64 global_id = 1;
-+ optional uint32 location = 2;
- optional bool share_only = 3 [default = false];
- optional bool req_def = 4 [default = false];
- optional uint32 client_id = 5 [default = 0];
-@@ -62,10 +62,10 @@ message DefinitionHeader
- {
- extend Message {
- // The classname for the driver process i.e. the client, typically
-- required string client_class = 10;
-+ optional string client_class = 10;
-
- // The classname for the process where the processing occurs
-- required string server_class = 11;
-+ optional string server_class = 11;
- }
- }
-
-@@ -76,32 +76,32 @@ message ProxyState
-
- message SubProxy
- {
-- required string name = 1;
-- required uint32 global_id = 2;
-+ optional string name = 1;
-+ optional uint32 global_id = 2;
- }
-
- message Annotation
- {
-- required string key = 1;
-- required string value = 2;
-+ optional string key = 1;
-+ optional string value = 2;
- }
-
- message UserData
- {
-- required string key = 1;
-+ optional string key = 1;
- repeated Variant variant = 2;
- }
-
- message Property
- {
-- required string name = 1;
-+ optional string name = 1;
- optional Variant value = 2;
- repeated UserData user_data = 3;
- }
-
- extend Message {
-- required string xml_group = 20;
-- required string xml_name = 21;
-+ optional string xml_group = 20;
-+ optional string xml_name = 21;
- optional string xml_sub_proxy_name = 22;
- repeated Property property = 23;
- repeated SubProxy subproxy = 24;
-@@ -118,8 +118,8 @@ message PXMRegistrationState
- message Entry
- {
- optional string group = 1;
-- required string name = 2;
-- required uint64 global_id = 3;
-+ optional string name = 2;
-+ optional uint64 global_id = 3;
- }
-
- extend Message {
-@@ -135,9 +135,9 @@ message ProxyDefinitionState
- {
- message ProxyXMLDefinition
- {
-- required string group = 1;
-- required string name = 2;
-- required string xml = 3;
-+ optional string group = 1;
-+ optional string name = 2;
-+ optional string xml = 3;
- }
-
- extend Message {
-@@ -181,9 +181,9 @@ message LinkState {
- OUTPUT = 2;
- }
-
-- required uint32 proxy = 1;
-+ optional uint32 proxy = 1;
- optional string property_name = 2;
-- required Direction direction = 3;
-+ optional Direction direction = 3;
- }
-
- extend Message {
-@@ -206,7 +206,7 @@ message MousePointer {
- }
-
- extend Message {
-- required uint32 view = 70;
-+ optional uint32 view = 70;
- optional double x = 71 [default = 0];
- optional double y = 72 [default = 0];
- optional bool forceShow = 73 [default = false];
-@@ -219,7 +219,7 @@ message MousePointer {
- message ChartViewBounds {
-
- extend Message {
-- required uint32 view = 75;
-+ optional uint32 view = 75;
- repeated double range = 76;
- }
- }
-@@ -229,7 +229,7 @@ message ChartViewBounds {
- message ClientsInformation {
-
- message ClientInfo {
-- required uint32 user = 1;
-+ optional uint32 user = 1;
- optional string name = 2;
- optional bool is_master = 3 [default = false];
- optional bool follow_cam = 4 [default = false];
-@@ -242,8 +242,8 @@ message ClientsInformation {
-
- message ChatMessage {
- extend Message {
-- required uint32 author = 84;
-- required string txt = 85;
-+ optional uint32 author = 84;
-+ optional string txt = 85;
- }
- }
-
-@@ -256,7 +256,7 @@ message QtEvent {
- }
-
- extend Message {
-- required QtEventType type = 98;
-+ optional QtEventType type = 98;
- }
- }
-
---- a/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx
-+++ b/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx
-@@ -363,6 +363,6 @@ void vtkSMCameraLink::LoadState(const vtkSMMessage *msg, vtkSMProxyLocator *loca
- void vtkSMCameraLink::UpdateState()
- {
- this->Superclass::UpdateState();
-- this->State->GetExtension(LinkState::sync_interactive_renders,
-+ this->State->SetExtension(LinkState::sync_interactive_renders,
- this->GetSynchronizeInteractiveRenders());
- }
diff --git a/sci-visualization/paraview/files/paraview-5.1.0-only-require-cmake-3.3.patch b/sci-visualization/paraview/files/paraview-5.1.0-only-require-cmake-3.3.patch
deleted file mode 100644
index 103c28a..00000000
--- a/sci-visualization/paraview/files/paraview-5.1.0-only-require-cmake-3.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d476bb2..bc814f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,7 +28,7 @@
- # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- #==========================================================================
--cmake_minimum_required(VERSION 3.5)
-+cmake_minimum_required(VERSION 3.3)
-
- project(ParaView)
-
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 5745716..00000000
--- a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-4.4.0.ebuild b/sci-visualization/paraview/paraview-4.4.0.ebuild
deleted file mode 100644
index e583325..00000000
--- a/sci-visualization/paraview/paraview-4.4.0.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-0.10.1
- 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
- >=x11-libs/gl2ps-1.3.8
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- 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
- dev-python/zope-interface[${PYTHON_USEDEP}]
- mpi? ( dev-python/mpi4py )
- 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}
- ${PYTHON_DEPS}
- boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-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-gcc-4.7.patch \
- "${FILESDIR}"/${PN}-4.2.0-protobuf.patch \
- "${FILESDIR}"/${PN}-4.3.1-fix-development-install.patch \
- "${FILESDIR}"/${PN}-4.3.1-protobuf-2.6.patch \
- "${FILESDIR}"/${P}-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() {
- # 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
- # 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-32x32.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.0-r1.ebuild b/sci-visualization/paraview/paraview-5.1.0-r1.ebuild
deleted file mode 100644
index 23fa295..00000000
--- a/sci-visualization/paraview/paraview-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}"
-
-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 +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-0.10.1
- 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
- >=x11-libs/gl2ps-1.3.8
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- coprocessing? (
- plugins? (
- dev-python/PyQt5
- dev-qt/qtgui:5
- )
- )
- 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
- dev-qt/qthelp:5
- dev-qt/qtopengl:5
- 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.3.1
- boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-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 \
- "${FILESDIR}"/${P}-only-require-cmake-3.3.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
- -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
- # 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 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}
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2017-06-01 7:36 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2017-06-01 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 566c3fcb2b7bc5da3dc457edc9c6153be48d6f4b
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 21:28:17 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 07:36:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566c3fcb
sci-visualization/paraview: version bump to 5.3.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-visualization/paraview/Manifest | 1 +
.../files/paraview-5.3.0-fix_buildsystem.patch | 24 ++
sci-visualization/paraview/paraview-5.3.0.ebuild | 286 +++++++++++++++++++++
3 files changed, 311 insertions(+)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 3e38d76c5b2..b6f448c2b83 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1 +1,2 @@
DIST ParaView-v5.2.0.tar.gz 47087129 SHA256 894e42ef8475bb49e4e7e64f4ee2c37c714facd18bfbb1d6de7f69676b062c96 SHA512 d46b71a03717bde164fe2b6cdcc1c478384ad0d379e203e75e69e1532f8703b4ce12f8992d39e61d09e2ad7bbf1e249fc1f00c4cdd65aabef831e0dca83485f1 WHIRLPOOL bfc63e95d899e9d7be5432f5e6b6e7a68731726b199a7dd897a4bcbe242537fa5cf2210d20ef4c725ab8af92609b0fb875078ec537577a074672776771f4fd2f
+DIST ParaView-v5.3.0.tar.gz 45173528 SHA256 046631bbf00775edc927314a3db207509666c9c6aadc7079e5159440fd2f88a0 SHA512 3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f WHIRLPOOL b69945d2f260a2419339bb289eaca252f018557c520c96fb64c0625e72587e2f3f159fff83b845f29d7de55f50547463cca9b7fe6d0920a2f95cb58a707930b3
diff --git a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch b/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
new file mode 100644
index 00000000000..600c7d43744
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
@@ -0,0 +1,24 @@
+From dcc3d775bddc270aa1a4d06f85807979ab0c8358 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@kyomu.43-1.org>
+Date: Thu, 1 Jun 2017 02:27:16 -0500
+Subject: [PATCH] fix buildsystem
+
+---
+ VTK/Utilities/Doxygen/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/VTK/Utilities/Doxygen/CMakeLists.txt b/VTK/Utilities/Doxygen/CMakeLists.txt
+index 3f285f6..7ebf3ee 100644
+--- a/VTK/Utilities/Doxygen/CMakeLists.txt
++++ b/VTK/Utilities/Doxygen/CMakeLists.txt
+@@ -80,7 +80,4 @@ if(NOT VTK_INSTALL_NO_DOCUMENTATION)
+ install(FILES doc_readme.txt
+ DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
+ COMPONENT Development)
+- install(DIRECTORY ${VTK_BINARY_DIR}/Utilities/Doxygen/doc/html
+- DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
+- COMPONENT Development)
+ endif()
+--
+2.13.0
+
diff --git a/sci-visualization/paraview/paraview-5.3.0.ebuild b/sci-visualization/paraview/paraview-5.3.0.ebuild
new file mode 100644
index 00000000000..221ba8da925
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.3.0.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2017 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
+ 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}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+ "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+)
+
+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() {
+
+ default
+ epatch "${PATCHES[@]}"
+
+ # 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 \
+ ParaViewConfig.cmake.in \
+ CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
+ ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
+ ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || 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}
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2018-07-08 2:57 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2018-07-08 2:57 UTC (permalink / raw
To: gentoo-commits
commit: 01a37861b1cc39f1b86581e4cdf38d5be563df5e
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 8 02:55:45 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 8 02:56:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a37861
sci-visualization/paraview: drop old
Closes: https://bugs.gentoo.org/660654
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sci-visualization/paraview/Manifest | 1 -
.../files/paraview-5.4.1-jsoncpp_1.8.4.patch | 17 --
sci-visualization/paraview/paraview-5.4.1.ebuild | 282 ---------------------
3 files changed, 300 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 7c9055385da..93c27c17c6e 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,2 +1 @@
-DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5
DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
diff --git a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
deleted file mode 100644
index b4b64e94eef..00000000000
--- a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-index b6e2b55..d27ad9d 100644
---- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-+++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
-@@ -788,7 +788,10 @@ public:
- this->GetSettingBelowPriority(propertySettingCString, highestPriority);
- if (lowerPriorityValue.isNull())
- {
-- if (!proxyValue.removeMember(property->GetXMLName()).isNull())
-+ // Allocated as done in Json::Value removeMember(const char* key).
-+ Json::Value removedValue;
-+ if (proxyValue.removeMember(property->GetXMLName(), &removedValue) &&
-+ !removedValue.isNull())
- {
- this->Modified();
- }
-
diff --git a/sci-visualization/paraview/paraview-5.4.1.ebuild b/sci-visualization/paraview/paraview-5.4.1.ebuild
deleted file mode 100644
index f1b68b99b8a..00000000000
--- a/sci-visualization/paraview/paraview-5.4.1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libxml2:2
- dev-libs/protobuf
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sci-libs/xdmf2
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- 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/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- 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}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
- "${FILESDIR}"/${P}-jsoncpp_1.8.4.patch
-)
-
-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() {
- cmake-utils_src_prepare
-
- # 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 \
- ParaViewConfig.cmake.in \
- CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
- ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
- ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || die
-
- # no proper switch
- if ! use nvcontrol; then
- sed -i \
- -e '/VTK_USE_NVCONTROL/s#1#0#' \
- VTK/Rendering/OpenGL/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- if use qt5; then
- export QT_SELECT=qt5
- fi
-
- 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_VERBOSE_MAKEFILE=ON
- -DVTK_Group_StandAlone=ON
- -DVTK_RENDERING_BACKEND=OpenGL2
- -DVTK_USE_FFMPEG_ENCODER=OFF
- -DVTK_USE_OFFSCREEN=TRUE
- # -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
- -DVTK_USE_SYSTEM_CGNS=ON
- -DVTK_USE_SYSTEM_PUGIXML=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_GLEW=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_INCREMENTAL=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_JSONCPP=ON
- -DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LZ4=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=ON
- -DVTK_USE_SYSTEM_XDMF2=OFF
- -DVTK_USE_SYSTEM_ZLIB=ON
- # force this module due to incorrect build system deps
- # wrt bug 460528
- -DModule_vtkUtilitiesProcessXML=ON
- )
-
- mycmakeargs+=(
- -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
-
- -DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
- -DModule_vtkGUISupportQtSQL="$(usex qt5)"
- -DModule_vtkGUISupportQtWebkit="$(usex qt5)"
- -DModule_vtkRenderingQt="$(usex qt5)"
- -DModule_vtkViewsQt="$(usex qt5)"
- -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
- -DVTK_Group_ParaViewQt="$(usex qt5)"
- -DVTK_Group_Qt="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
-
- -DModule_vtkInfovisBoost="$(usex boost)"
-
- -DPARAVIEW_USE_ICE_T="$(usex mpi)"
- -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DVTK_Group_MPI="$(usex mpi)"
- -DVTK_XDMF_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
-
- -DModule_AutobahnPython="$(usex python)"
- -DModule_pqPython="$(usex python)"
- -DModule_Twisted="$(usex python)"
- -DModule_vtkmpi4py="$(usex python)"
- -DModule_vtkPython="$(usex python)"
- -DModule_vtkWrappingPythonCore="$(usex python)"
- -DModule_ZopeInterface="$(usex python)"
- -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
- -DXDMF_WRAP_PYTHON="$(usex python)"
-
- -DBUILD_DOCUMENTATION="$(usex doc)"
-
- -DBUILD_EXAMPLES="$(usex examples)"
-
- -DModule_vtkIOMySQL="$(usex mysql)"
-
- -DModule_vtksqlite="$(usex sqlite)"
-
- -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
-
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
- -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
-
- -DVTK_Group_Tk="$(usex tk)"
- -DVTK_USE_TK="$(usex tk)"
- -DModule_vtkRenderingTk="$(usex tk)"
- -DModule_vtkTclTk="$(usex tcl)"
- -DModule_vtkWrappingTcl="$(usex tcl)"
- -DBUILD_TESTING="$(usex test)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- # TODO: MantaView VaporPlugin VRPlugin
- mycmakeargs+=(
- -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
- # these are always needed for plugins
- -DModule_vtkFiltersFlowPaths="$(usex plugins)"
- -DModule_vtkPVServerManagerApplication="$(usex plugins)"
- )
-
- 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} || die
-
- 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}
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2018-07-15 16:09 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-07-15 16:09 UTC (permalink / raw
To: gentoo-commits
commit: cd51ce629612c468a58d64303e6ec94d6e9c0e56
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 08:54:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 16:08:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd51ce62
sci-visualization/paraview: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/660798
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../paraview/files/paraview-5.5.2-qt-5.11.patch | 142 +++++++++++++++++++++
sci-visualization/paraview/paraview-5.5.2.ebuild | 1 +
2 files changed, 143 insertions(+)
diff --git a/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
new file mode 100644
index 00000000000..b4299d4ee37
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
@@ -0,0 +1,142 @@
+From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001
+From: Robert O'Bara <bob.obara@kitware.com>
+Date: Thu, 24 May 2018 09:49:28 -0400
+Subject: [PATCH] ENH: Changes needed to support Qt 5.11
+
+Basically needed to add missing header files.
+---
+ Plugins/SLACTools/pqSLACDataLoadManager.cxx | 1 +
+ Qt/ApplicationComponents/pqColorMapEditor.cxx | 1 +
+ Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx | 1 +
+ .../pqStandardViewFrameActionsImplementation.cxx | 1 +
+ Qt/ApplicationComponents/pqTimeInspectorWidget.cxx | 1 +
+ .../pqTransferFunctionWidgetPropertyDialog.cxx | 2 ++
+ Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx | 1 +
+ Qt/Components/pqChangeInputDialog.cxx | 1 +
+ Qt/Components/pqCinemaTrackSelection.cxx | 1 +
+ Qt/Python/pqPythonShell.cxx | 1 +
+ 10 files changed, 11 insertions(+)
+
+diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
+index 3ba019c26b..ce38396f68 100644
+--- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx
++++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
+@@ -34,6 +34,7 @@
+ #include "vtkSMProperty.h"
+ #include "vtkSMSourceProxy.h"
+
++#include <QAction>
+ #include <QPushButton>
+ #include <QtDebug>
+
+diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx
+index 0395185e0a..88b56745eb 100644
+--- a/Qt/ApplicationComponents/pqColorMapEditor.cxx
++++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx
+@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <QDebug>
+ #include <QKeyEvent>
+ #include <QPointer>
++#include <QStyle>
+ #include <QVBoxLayout>
+
+ class pqColorMapEditor::pqInternals
+diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
+index 908e4598e0..820361a2b3 100644
+--- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
++++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
+@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMUncheckedPropertyHelper.h"
+
+ #include <QGridLayout>
++#include <QStyle>
+
+ class pqDoubleRangeSliderPropertyWidget::pqInternals
+ {
+diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
+index c297dc3d9e..501633f63a 100644
+--- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
++++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
+@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <QPushButton>
+ #include <QSet>
+ #include <QShortcut>
++#include <QStyle>
+
+ //-----------------------------------------------------------------------------
+ pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
+diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
+index 6774c2e48e..e85e614f04 100644
+--- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
++++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
+@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMPropertyHelper.h"
+ #include "vtkSMSourceProxy.h"
+
++#include <QHeaderView>
+ #include <QLineF>
+ #include <QPainter>
+ #include <QVariant>
+diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
+index 55d3146447..93cd995d92 100644
+--- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
++++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
+@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkPiecewiseFunction.h"
+ #include <QString>
+
++#include <QDoubleValidator>
++
+ class pqTransferFunctionWidgetPropertyDialog::pqInternals
+ {
+ public:
+diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
+index 6d2865431e..8d2c4b61cd 100644
+--- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
++++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
+@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMProxy.h"
+
+ #include <QIntValidator>
++#include <QStyle>
+
+ class pqViewResolutionPropertyWidget::pqInternals
+ {
+diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx
+index 8a67b10095..86db3de01c 100644
+--- a/Qt/Components/pqChangeInputDialog.cxx
++++ b/Qt/Components/pqChangeInputDialog.cxx
+@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkSMProxy.h"
+ #include "vtkSmartPointer.h"
+
++#include <QHeaderView>
+ #include <QItemSelectionModel>
+ #include <QLineEdit>
+ #include <QRadioButton>
+diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx
+index 3d6d9dde19..eea2e37680 100644
+--- a/Qt/Components/pqCinemaTrackSelection.cxx
++++ b/Qt/Components/pqCinemaTrackSelection.cxx
+@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ========================================================================*/
+ #include <QDebug>
++#include <QHeaderView>
+
+ #include "vtkPVArrayInformation.h"
+ #include "vtkPVDataInformation.h"
+diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
+index 3d01fd0a96..bc1a014936 100644
+--- a/Qt/Python/pqPythonShell.cxx
++++ b/Qt/Python/pqPythonShell.cxx
+@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "vtkStringOutputWindow.h"
+ #include "vtkWeakPointer.h"
+
++#include <QAbstractItemView>
+ #include <QApplication>
+ #include <QCursor>
+ #include <QFile>
+--
+2.17.1
diff --git a/sci-visualization/paraview/paraview-5.5.2.ebuild b/sci-visualization/paraview/paraview-5.5.2.ebuild
index b34d4ec9805..01c949e0ed1 100644
--- a/sci-visualization/paraview/paraview-5.5.2.ebuild
+++ b/sci-visualization/paraview/paraview-5.5.2.ebuild
@@ -99,6 +99,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+ "${FILESDIR}"/${P}-qt-5.11.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2019-06-30 18:20 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2019-06-30 18:20 UTC (permalink / raw
To: gentoo-commits
commit: dc620c1481998584ba8269585d82f04fe980fffa
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 14:48:09 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 18:19:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc620c14
sci-visualization/paraview: version bump to 5.6.1
- Version bump to 5.6.1
- OpenMP 4.0 compatibility
- Fix various dependencies
Closes: https://bugs.gentoo.org/661860
Closes: https://bugs.gentoo.org/686362
Closes: https://bugs.gentoo.org/686990
Closes: https://bugs.gentoo.org/687534
Closes: https://bugs.gentoo.org/687790
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-visualization/paraview/Manifest | 1 +
.../files/paraview-5.6.1-fix_openmp_4.0.patch | 32 +++
sci-visualization/paraview/paraview-5.6.1.ebuild | 312 +++++++++++++++++++++
3 files changed, 345 insertions(+)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 9b7d008bf85..396d42620be 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,2 +1,3 @@
DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
DIST ParaView-v5.6.0.tar.gz 54085457 BLAKE2B a99a320f87af19ad4d39336e148f4ab1989225111299341ff3ebb095c652f1392362e42ce90dab8fe7390c44f9200637e76c1076e07d61c7e6cd4aad93df3a83 SHA512 4d7c1b9f5781411cdd290a0ef105221deca1af28bb29b8e6e6c077f3377b110e7c86637c11514559d2d826d36f189d5b5c1caa9e5f9c53820cf35c3ade1ae1f6
+DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45
diff --git a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
new file mode 100644
index 00000000000..51562415031
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
@@ -0,0 +1,32 @@
+diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h 2018-11-07 05:05:18.000000000 +1000
++++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h 2019-06-28 14:04:02.292922908 +1000
+@@ -290,7 +290,7 @@
+ std::unique_ptr<ReturnType[]> threadData;
+
+ VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
+- shared(data, doParallel, numThreads, threadData))
++ shared(data, doParallel, numThreads, threadData, numVals))
+ {
+
+ int tid = omp_get_thread_num();
+@@ -422,7 +422,7 @@
+ vtkm::Id outIdx = 0;
+
+ VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f)
+- shared(outIdx))
++ shared(outIdx, numValues))
+ {
+ int tid = omp_get_thread_num();
+ int numThreads = omp_get_num_threads();
+diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h 2018-11-07 05:05:18.000000000 +1000
++++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h 2019-06-28 13:54:33.132064191 +1000
+@@ -133,6 +133,7 @@
+ VTKM_OPENMP_DIRECTIVE(parallel for
+ default(none)
+ firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
++ shared(size)
+ schedule(static))
+ for (vtkm::Id i = 0; i < size; ++i)
+ {
diff --git a/sci-visualization/paraview/paraview-5.6.1.ebuild b/sci-visualization/paraview/paraview-5.6.1.ebuild
new file mode 100644
index 00000000000..a1cc1d76516
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.6.1.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit cmake-utils desktop gnome2-utils python-single-r1 toolchain-funcs
+
+MAIN_PV=$(ver_cut 0-1)
+MAJOR_PV=$(ver_cut 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="Powerful scientific data visualization application"
+HOMEPAGE="https://www.paraview.org"
+SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk"
+
+RESTRICT="mirror test"
+
+# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
+ mysql? ( sqlite )
+ ?? ( offscreen qt5 )"
+
+RDEPEND="
+ app-arch/lz4
+ dev-libs/expat
+ dev-libs/jsoncpp
+ dev-libs/libxml2:2
+ dev-libs/protobuf:=
+ dev-libs/pugixml
+ media-libs/freetype
+ media-libs/glew:0
+ media-libs/libpng:0
+ media-libs/libtheora
+ media-libs/tiff:0=
+ sci-libs/cgnslib
+ sci-libs/hdf5:=[mpi=]
+ >=sci-libs/netcdf-4.2[hdf5]
+ >=sci-libs/netcdf-cxx-4.2:3
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ 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? ( dev-db/mysql-connector-c )
+ offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
+ !offscreen? ( virtual/opengl )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/constantly[${PYTHON_USEDEP}]
+ dev-python/incremental[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ || ( dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ )
+ 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}
+ boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] )
+ doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+ "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+ "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+ "${FILESDIR}"/${PN}-5.6.1-fix_openmp_4.0.patch
+)
+
+CMAKE_MAKEFILE_GENERATOR="emake" #579474
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
+ python-single-r1_pkg_setup
+ PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+
+ # Bug #661812
+ mkdir -p Plugins/StreamLinesRepresentation/doc || die
+
+ cmake-utils_src_prepare
+
+ # lib64 fixes
+ sed -i \
+ -e "s:/lib/python:/$(get_libdir)/python:g" \
+ VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+ sed -i \
+ -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+ ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+ if use qt5; then
+ export QT_SELECT=qt5
+ fi
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+ -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+ -DBUILD_SHARED_LIBS=ON
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+
+ -DVTK_Group_StandAlone=ON
+ -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE
+
+ -DVTK_USE_OGGTHEORA_ENCODER=TRUE
+ -DVTK_USE_SYSTEM_CGNS=ON
+ -DVTK_USE_SYSTEM_PUGIXML=ON
+ -DVTK_USE_SYSTEM_EXPAT=ON
+ -DVTK_USE_SYSTEM_FREETYPE=ON
+ -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
+ -DVTK_USE_SYSTEM_GLEW=ON
+ -DVTK_USE_SYSTEM_HDF5=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_JSONCPP=ON
+ -DVTK_USE_SYSTEM_LIBXML2=ON
+ -DVTK_USE_SYSTEM_LZ4=ON
+ -DVTK_USE_SYSTEM_NETCDF=ON
+ -DVTK_USE_SYSTEM_PNG=ON
+ -DVTK_USE_SYSTEM_PROTOBUF=ON
+ -DVTK_USE_SYSTEM_TIFF=ON
+ -DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226
+ -DVTK_USE_SYSTEM_ZLIB=ON
+
+ # boost
+ -DModule_vtkInfovisBoost="$(usex boost)"
+
+ # coprocessing
+ -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+
+ # doc
+ -DBUILD_DOCUMENTATION="$(usex doc)"
+
+ # examples
+ -DBUILD_EXAMPLES="$(usex examples)"
+
+ # ffmpeg
+ -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+ -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+ -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
+
+ # mpi
+ -DPARAVIEW_USE_ICE_T="$(usex mpi)"
+ -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
+ -DPARAVIEW_USE_MPI="$(usex mpi)"
+ -DVTK_Group_MPI="$(usex mpi)"
+ -DVTK_XDMF_USE_MPI="$(usex mpi)"
+ -DXDMF_BUILD_MPI="$(usex mpi)"
+
+ # mysql
+ -DModule_vtkIOMySQL="$(usex mysql)"
+
+ # offscreen
+ -DVTK_USE_X=$(usex !offscreen)
+ -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+ -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+
+ # plugins
+ -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
+ -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
+ # these are always needed for plugins
+ -DModule_vtkFiltersFlowPaths="$(usex plugins)"
+ -DModule_vtkPVServerManagerApplication="$(usex plugins)"
+ # force this module due to incorrect build system deps wrt bug 460528
+ -DModule_vtkUtilitiesProcessXML=ON
+
+ # python
+ -DModule_pqPython="$(usex python)"
+ -DModule_vtkmpi4py="$(usex python)"
+ -DModule_vtkPython="$(usex python)"
+ -DModule_vtkWrappingPythonCore="$(usex python)"
+ -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
+ -DXDMF_WRAP_PYTHON="$(usex python)"
+
+ # qt5
+ -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
+ -DModule_vtkGUISupportQtSQL="$(usex qt5)"
+ -DModule_vtkRenderingQt="$(usex qt5)"
+ -DModule_vtkViewsQt="$(usex qt5)"
+ -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
+ -DVTK_Group_ParaViewQt="$(usex qt5)"
+ -DVTK_Group_Qt="$(usex qt5)"
+ -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+ $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+ -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+
+ # sqlite
+ -DModule_vtksqlite="$(usex sqlite)"
+
+ # tcl
+ -DModule_vtkTclTk="$(usex tcl)"
+
+ # test
+ -DBUILD_TESTING="$(usex test)"
+
+ # tk
+ -DVTK_Group_Tk="$(usex tk)"
+ -DVTK_USE_TK="$(usex tk)"
+ -DModule_vtkRenderingTk="$(usex tk)"
+ )
+
+ if use openmp; then
+ mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ -DVTK_USE_SYSTEM_TWISTED=ON
+ -DVTK_USE_SYSTEM_AUTOBAHN=ON
+ -DVTK_USE_SYSTEM_ZOPE=ON
+ )
+ fi
+
+ if use qt5; then
+ mycmakeargs+=(
+ -DVTK_USE_QVTK=ON
+ -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+ -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+ -DVTK_QT_VERSION=5
+ -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+ -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+ -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+ -DVTK_Group_Qt:BOOL=ON
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # remove wrapper binaries and put the actual executable in place
+ for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+ if [ -f "${ED}"/usr/lib/"$i" ]; then
+ mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+ fi
+ done
+
+ # install libraries into correct directory respecting get_libdir:
+ mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
+ mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
+ mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
+ rmdir "${ED}"/usr/lib_tmp || die
+
+ # set up the environment
+ echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+ doenvd "${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}
+ }
+
+ pkg_postinst() {
+ gnome2_icon_cache_update
+ }
+
+ pkg_postrm() {
+ gnome2_icon_cache_update
+ }
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2019-08-05 0:08 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2019-08-05 0:08 UTC (permalink / raw
To: gentoo-commits
commit: ea2167810adac39a68b91f97cc3bdb4cff8b9c5e
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 22:49:25 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 00:07:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea216781
sci-visualization/paraview: drop old
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-visualization/paraview/Manifest | 2 -
.../paraview/files/paraview-5.5.2-qt-5.11.patch | 142 ----------
sci-visualization/paraview/paraview-5.5.2.ebuild | 284 -------------------
.../paraview/paraview-5.6.0-r1.ebuild | 309 ---------------------
4 files changed, 737 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 396d42620be..c8a70e548ba 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,3 +1 @@
-DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
-DIST ParaView-v5.6.0.tar.gz 54085457 BLAKE2B a99a320f87af19ad4d39336e148f4ab1989225111299341ff3ebb095c652f1392362e42ce90dab8fe7390c44f9200637e76c1076e07d61c7e6cd4aad93df3a83 SHA512 4d7c1b9f5781411cdd290a0ef105221deca1af28bb29b8e6e6c077f3377b110e7c86637c11514559d2d826d36f189d5b5c1caa9e5f9c53820cf35c3ade1ae1f6
DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45
diff --git a/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
deleted file mode 100644
index b4299d4ee37..00000000000
--- a/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001
-From: Robert O'Bara <bob.obara@kitware.com>
-Date: Thu, 24 May 2018 09:49:28 -0400
-Subject: [PATCH] ENH: Changes needed to support Qt 5.11
-
-Basically needed to add missing header files.
----
- Plugins/SLACTools/pqSLACDataLoadManager.cxx | 1 +
- Qt/ApplicationComponents/pqColorMapEditor.cxx | 1 +
- Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx | 1 +
- .../pqStandardViewFrameActionsImplementation.cxx | 1 +
- Qt/ApplicationComponents/pqTimeInspectorWidget.cxx | 1 +
- .../pqTransferFunctionWidgetPropertyDialog.cxx | 2 ++
- Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx | 1 +
- Qt/Components/pqChangeInputDialog.cxx | 1 +
- Qt/Components/pqCinemaTrackSelection.cxx | 1 +
- Qt/Python/pqPythonShell.cxx | 1 +
- 10 files changed, 11 insertions(+)
-
-diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-index 3ba019c26b..ce38396f68 100644
---- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-+++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
-@@ -34,6 +34,7 @@
- #include "vtkSMProperty.h"
- #include "vtkSMSourceProxy.h"
-
-+#include <QAction>
- #include <QPushButton>
- #include <QtDebug>
-
-diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx
-index 0395185e0a..88b56745eb 100644
---- a/Qt/ApplicationComponents/pqColorMapEditor.cxx
-+++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx
-@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QDebug>
- #include <QKeyEvent>
- #include <QPointer>
-+#include <QStyle>
- #include <QVBoxLayout>
-
- class pqColorMapEditor::pqInternals
-diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-index 908e4598e0..820361a2b3 100644
---- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-+++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
-@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMUncheckedPropertyHelper.h"
-
- #include <QGridLayout>
-+#include <QStyle>
-
- class pqDoubleRangeSliderPropertyWidget::pqInternals
- {
-diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-index c297dc3d9e..501633f63a 100644
---- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-+++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
-@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <QPushButton>
- #include <QSet>
- #include <QShortcut>
-+#include <QStyle>
-
- //-----------------------------------------------------------------------------
- pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
-diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-index 6774c2e48e..e85e614f04 100644
---- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-+++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
-@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMPropertyHelper.h"
- #include "vtkSMSourceProxy.h"
-
-+#include <QHeaderView>
- #include <QLineF>
- #include <QPainter>
- #include <QVariant>
-diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-index 55d3146447..93cd995d92 100644
---- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-+++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
-@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkPiecewiseFunction.h"
- #include <QString>
-
-+#include <QDoubleValidator>
-+
- class pqTransferFunctionWidgetPropertyDialog::pqInternals
- {
- public:
-diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-index 6d2865431e..8d2c4b61cd 100644
---- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-+++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
-@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMProxy.h"
-
- #include <QIntValidator>
-+#include <QStyle>
-
- class pqViewResolutionPropertyWidget::pqInternals
- {
-diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx
-index 8a67b10095..86db3de01c 100644
---- a/Qt/Components/pqChangeInputDialog.cxx
-+++ b/Qt/Components/pqChangeInputDialog.cxx
-@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkSMProxy.h"
- #include "vtkSmartPointer.h"
-
-+#include <QHeaderView>
- #include <QItemSelectionModel>
- #include <QLineEdit>
- #include <QRadioButton>
-diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx
-index 3d6d9dde19..eea2e37680 100644
---- a/Qt/Components/pqCinemaTrackSelection.cxx
-+++ b/Qt/Components/pqCinemaTrackSelection.cxx
-@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ========================================================================*/
- #include <QDebug>
-+#include <QHeaderView>
-
- #include "vtkPVArrayInformation.h"
- #include "vtkPVDataInformation.h"
-diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
-index 3d01fd0a96..bc1a014936 100644
---- a/Qt/Python/pqPythonShell.cxx
-+++ b/Qt/Python/pqPythonShell.cxx
-@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include "vtkStringOutputWindow.h"
- #include "vtkWeakPointer.h"
-
-+#include <QAbstractItemView>
- #include <QApplication>
- #include <QCursor>
- #include <QFile>
---
-2.17.1
diff --git a/sci-visualization/paraview/paraview-5.5.2.ebuild b/sci-visualization/paraview/paraview-5.5.2.ebuild
deleted file mode 100644
index 533032935e8..00000000000
--- a/sci-visualization/paraview/paraview-5.5.2.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils desktop eapi7-ver gnome2-utils python-single-r1 toolchain-funcs
-
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="Powerful scientific data visualization application"
-HOMEPAGE="https://www.paraview.org"
-SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
-
-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="mirror test"
-
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libxml2:2
- dev-libs/protobuf
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- 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? ( dev-db/mysql-connector-c )
- python? (
- ${PYTHON_DEPS}
- dev-python/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- || ( dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- )
- 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}
- boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
- "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
- "${FILESDIR}"/${P}-qt-5.11.patch
-)
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
- python-single-r1_pkg_setup
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
-
- # Bug #661812
- mkdir -p Plugins/StreamLinesRepresentation/doc || die
-
- cmake-utils_src_prepare
-
- # lib64 fixes
- sed -i \
- -e "s:/lib/python:/$(get_libdir)/python:g" \
- VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
- sed -i \
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
- ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
- if use qt5; then
- export QT_SELECT=qt5
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="${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_VERBOSE_MAKEFILE=ON
- -DVTK_Group_StandAlone=ON
- -DVTK_RENDERING_BACKEND=OpenGL2
- -DVTK_USE_FFMPEG_ENCODER=OFF
- -DVTK_USE_OFFSCREEN=TRUE
- # -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
- -DVTK_USE_SYSTEM_CGNS=ON
- -DVTK_USE_SYSTEM_PUGIXML=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_GLEW=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_INCREMENTAL=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_JSONCPP=ON
- -DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LZ4=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 # does not compile with sci-libs/xdmf2-1.0_p141226
- -DVTK_USE_SYSTEM_ZLIB=ON
- # force this module due to incorrect build system deps
- # wrt bug 460528
- -DModule_vtkUtilitiesProcessXML=ON
- )
-
- mycmakeargs+=(
- -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
-
- -DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
- -DModule_vtkGUISupportQtSQL="$(usex qt5)"
- -DModule_vtkGUISupportQtWebkit="$(usex qt5)"
- -DModule_vtkRenderingQt="$(usex qt5)"
- -DModule_vtkViewsQt="$(usex qt5)"
- -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
- -DVTK_Group_ParaViewQt="$(usex qt5)"
- -DVTK_Group_Qt="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
- -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
-
- -DModule_vtkInfovisBoost="$(usex boost)"
-
- -DPARAVIEW_USE_ICE_T="$(usex mpi)"
- -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DVTK_Group_MPI="$(usex mpi)"
- -DVTK_XDMF_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
-
- -DModule_AutobahnPython="$(usex python)"
- -DModule_pqPython="$(usex python)"
- -DModule_Twisted="$(usex python)"
- -DModule_vtkmpi4py="$(usex python)"
- -DModule_vtkPython="$(usex python)"
- -DModule_vtkWrappingPythonCore="$(usex python)"
- -DModule_ZopeInterface="$(usex python)"
- -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
- -DXDMF_WRAP_PYTHON="$(usex python)"
-
- -DBUILD_DOCUMENTATION="$(usex doc)"
-
- -DBUILD_EXAMPLES="$(usex examples)"
-
- -DModule_vtkIOMySQL="$(usex mysql)"
-
- -DModule_vtksqlite="$(usex sqlite)"
-
- -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
-
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
- -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
-
- -DVTK_Group_Tk="$(usex tk)"
- -DVTK_USE_TK="$(usex tk)"
- -DModule_vtkRenderingTk="$(usex tk)"
- -DModule_vtkTclTk="$(usex tcl)"
- -DModule_vtkWrappingTcl="$(usex tcl)"
- -DBUILD_TESTING="$(usex test)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- # TODO: MantaView VaporPlugin VRPlugin
- mycmakeargs+=(
- -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
- # these are always needed for plugins
- -DModule_vtkFiltersFlowPaths="$(usex plugins)"
- -DModule_vtkPVServerManagerApplication="$(usex plugins)"
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # remove wrapper binaries and put the actual executable in place
- for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
- if [ -f "${ED}"/usr/lib/"$i" ]; then
- mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
- fi
- done
-
- # install libraries into correct directory respecting get_libdir:
- mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
- mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
- mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
- rmdir "${ED}"/usr/lib_tmp || die
-
- # set up the environment
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
- doenvd "${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}
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/sci-visualization/paraview/paraview-5.6.0-r1.ebuild b/sci-visualization/paraview/paraview-5.6.0-r1.ebuild
deleted file mode 100644
index e566a2b7630..00000000000
--- a/sci-visualization/paraview/paraview-5.6.0-r1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs
-
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="Powerful scientific data visualization application"
-HOMEPAGE="https://www.paraview.org"
-SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk"
-
-RESTRICT="mirror test"
-
-# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )
- ?? ( offscreen qt5 )"
-
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libxml2:2
- dev-libs/protobuf
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- 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? ( dev-db/mysql-connector-c )
- offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
- !offscreen? ( virtual/opengl )
- python? (
- ${PYTHON_DEPS}
- dev-python/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- || ( dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/twisted-core[${PYTHON_USEDEP}]
- )
- 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/qtwebengine:5[widgets]
- dev-qt/qtx11extras:5
- )
- sqlite? ( dev-db/sqlite:3 )
- tcl? ( dev-lang/tcl:0= )
- tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
- "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
-)
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
- python-single-r1_pkg_setup
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
-
- # Bug #661812
- mkdir -p Plugins/StreamLinesRepresentation/doc || die
-
- cmake-utils_src_prepare
-
- # lib64 fixes
- sed -i \
- -e "s:/lib/python:/$(get_libdir)/python:g" \
- VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
- sed -i \
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
- ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
- if use qt5; then
- export QT_SELECT=qt5
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
- -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
- -DBUILD_SHARED_LIBS=ON
- -DCMAKE_VERBOSE_MAKEFILE=ON
-
- -DVTK_Group_StandAlone=ON
- -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE
-
- -DVTK_USE_OGGTHEORA_ENCODER=TRUE
- -DVTK_USE_SYSTEM_CGNS=ON
- -DVTK_USE_SYSTEM_PUGIXML=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_GLEW=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_JSONCPP=ON
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LZ4=ON
- -DVTK_USE_SYSTEM_NETCDF=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_PROTOBUF=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226
- -DVTK_USE_SYSTEM_ZLIB=ON
-
- # boost
- -DModule_vtkInfovisBoost="$(usex boost)"
-
- # coprocessing
- -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
-
- # doc
- -DBUILD_DOCUMENTATION="$(usex doc)"
-
- # examples
- -DBUILD_EXAMPLES="$(usex examples)"
-
- # ffmpeg
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
- -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
-
- # mpi
- -DPARAVIEW_USE_ICE_T="$(usex mpi)"
- -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DVTK_Group_MPI="$(usex mpi)"
- -DVTK_XDMF_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
-
- # mysql
- -DModule_vtkIOMySQL="$(usex mysql)"
-
- # offscreen
- -DVTK_USE_X=$(usex !offscreen)
- -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
- -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-
- # plugins
- -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
- # these are always needed for plugins
- -DModule_vtkFiltersFlowPaths="$(usex plugins)"
- -DModule_vtkPVServerManagerApplication="$(usex plugins)"
- # force this module due to incorrect build system deps wrt bug 460528
- -DModule_vtkUtilitiesProcessXML=ON
-
- # python
- -DModule_pqPython="$(usex python)"
- -DModule_vtkmpi4py="$(usex python)"
- -DModule_vtkPython="$(usex python)"
- -DModule_vtkWrappingPythonCore="$(usex python)"
- -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
- -DXDMF_WRAP_PYTHON="$(usex python)"
-
- # qt5
- -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
- -DModule_vtkGUISupportQtSQL="$(usex qt5)"
- -DModule_vtkRenderingQt="$(usex qt5)"
- -DModule_vtkViewsQt="$(usex qt5)"
- -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
- -DVTK_Group_ParaViewQt="$(usex qt5)"
- -DVTK_Group_Qt="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
- -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
-
- # sqlite
- -DModule_vtksqlite="$(usex sqlite)"
-
- # tcl
- -DModule_vtkTclTk="$(usex tcl)"
-
- # test
- -DBUILD_TESTING="$(usex test)"
-
- # tk
- -DVTK_Group_Tk="$(usex tk)"
- -DVTK_USE_TK="$(usex tk)"
- -DModule_vtkRenderingTk="$(usex tk)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DVTK_USE_SYSTEM_TWISTED=ON
- -DVTK_USE_SYSTEM_AUTOBAHN=ON
- -DVTK_USE_SYSTEM_ZOPE=ON
- )
- fi
-
- if use qt5; then
- mycmakeargs+=(
- -DVTK_USE_QVTK=ON
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
- -DVTK_QT_VERSION=5
- -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
- -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
- -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
- -DVTK_Group_Qt:BOOL=ON
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # remove wrapper binaries and put the actual executable in place
- for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
- if [ -f "${ED}"/usr/lib/"$i" ]; then
- mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
- fi
- done
-
- # install libraries into correct directory respecting get_libdir:
- mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
- mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
- mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
- rmdir "${ED}"/usr/lib_tmp || die
-
- # set up the environment
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
- doenvd "${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}
- }
-
- pkg_postinst() {
- gnome2_icon_cache_update
- }
-
- pkg_postrm() {
- gnome2_icon_cache_update
- }
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2020-04-03 2:49 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2020-04-03 2:49 UTC (permalink / raw
To: gentoo-commits
commit: 9fcdb13aea164e1887a298a6ff5f718696762272
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 3 02:48:04 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Apr 3 02:48:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fcdb13a
sci-visualization/paraview: drop old
Closes: https://bugs.gentoo.org/692674
Closes: https://bugs.gentoo.org/683896
Closes: https://bugs.gentoo.org/683810
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-visualization/paraview/Manifest | 1 -
.../files/paraview-5.6.1-fix_openmp_4.0.patch | 81 ------
.../paraview/paraview-5.6.1-r1.ebuild | 315 ---------------------
3 files changed, 397 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 1b17968014f..3173c63282b 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,2 +1 @@
-DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45
DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2
diff --git a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
deleted file mode 100644
index cf215070893..00000000000
--- a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From e30cb0872593d1614392817762b871de36e4c2f3 Mon Sep 17 00:00:00 2001
-From: Allison Vacanti <allison.vacanti@kitware.com>
-Date: Thu, 27 Jun 2019 16:04:53 -0400
-Subject: [PATCH] Fix OpenMP for gcc-9 backwards incompatibility.
-
-For details, see
-
-https://www.gnu.org/software/gcc/gcc-9/porting_to.html
----
- vtkm/cont/openmp/internal/FunctorsOpenMP.h | 18 +++++++++++++++---
- vtkm/cont/openmp/internal/ParallelSortOpenMP.h | 4 +++-
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h b/vtkm/cont/openmp/internal/FunctorsOpenMP.h
-index 27cd2bc0..0271754c 100644
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
-+++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
-@@ -36,6 +36,18 @@
- #define VTKM_OPENMP_DIRECTIVE(directive)
- #endif // _OPENMP
-
-+// See "OpenMP data sharing" section of
-+// https://www.gnu.org/software/gcc/gcc-9/porting_to.html. OpenMP broke
-+// backwards compatibility regarding const variable handling.
-+// tl;dr, put all const variables accessed from openmp blocks in a
-+// VTKM_OPENMP_SHARED_CONST(var1, var2, ...) macro. This will do The Right Thing
-+// on all gcc.
-+#if defined(__GNUC__) && __GNUC__ >= 9
-+#define VTKM_OPENMP_SHARED_CONST(...) shared(__VA_ARGS__)
-+#else
-+#define VTKM_OPENMP_SHARED_CONST(...)
-+#endif
-+
- // When defined, supported type / operator combinations will use the OpenMP
- // reduction(...) clause. Otherwise, all reductions use the general
- // implementation with a manual reduction once the threads complete.
-@@ -279,8 +291,8 @@ struct ReduceHelper
- int numThreads = 0;
- std::unique_ptr<ReturnType[]> threadData;
-
-- VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
-- shared(data, doParallel, numThreads, threadData))
-+ VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f) shared(
-+ data, doParallel, numThreads, threadData) VTKM_OPENMP_SHARED_CONST(numVals))
- {
-
- int tid = omp_get_thread_num();
-@@ -412,7 +424,7 @@ void ReduceByKeyHelper(KeysInArray keysInArray,
- vtkm::Id outIdx = 0;
-
- VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f)
-- shared(outIdx))
-+ shared(outIdx) VTKM_OPENMP_SHARED_CONST(numValues))
- {
- int tid = omp_get_thread_num();
- int numThreads = omp_get_num_threads();
-diff --git a/vtkm/cont/openmp/internal/ParallelSortOpenMP.h b/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
-index e06d1762..a973eee6 100644
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
-+++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
-@@ -123,7 +123,8 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
- VTKM_OPENMP_DIRECTIVE(parallel for
- default(none)
- firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
-- schedule(static))
-+ schedule(static)
-+ VTKM_OPENMP_SHARED_CONST(size))
- for (vtkm::Id i = 0; i < size; ++i)
- {
- valuesOutPortal.Set(i, valuesInPortal.Get(indexPortal.Get(i)));
-@@ -209,6 +210,7 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
- VTKM_OPENMP_DIRECTIVE(parallel for
- default(none)
- firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
-+ VTKM_OPENMP_SHARED_CONST(size)
- schedule(static))
- for (vtkm::Id i = 0; i < size; ++i)
- {
---
-2.21.0
-
diff --git a/sci-visualization/paraview/paraview-5.6.1-r1.ebuild b/sci-visualization/paraview/paraview-5.6.1-r1.ebuild
deleted file mode 100644
index 5a52eb5730f..00000000000
--- a/sci-visualization/paraview/paraview-5.6.1-r1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs
-
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="Powerful scientific data visualization application"
-HOMEPAGE="https://www.paraview.org"
-SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk"
-
-RESTRICT="mirror test"
-
-# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )
- ?? ( offscreen qt5 )"
-
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp:=
- dev-libs/libxml2:2
- dev-libs/protobuf:=
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5:=[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- 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? ( dev-db/mysql-connector-c )
- offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
- !offscreen? ( virtual/opengl )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/constantly[${PYTHON_MULTI_USEDEP}]
- dev-python/incremental[${PYTHON_MULTI_USEDEP}]
- dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- dev-python/twisted[${PYTHON_MULTI_USEDEP}]
- dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
- mpi? ( dev-python/mpi4py )
- qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_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/qtwebengine:5[widgets]
- dev-qt/qtx11extras:5
- )
- sqlite? ( dev-db/sqlite:3 )
- tcl? ( dev-lang/tcl:0= )
- tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- boost? (
- $(python_gen_cond_dep '
- dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
- ')
- )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
- "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
- "${FILESDIR}"/${PN}-5.6.1-fix_openmp_4.0.patch
-)
-
-CMAKE_MAKEFILE_GENERATOR="emake" #579474
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
- python-single-r1_pkg_setup
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
-
- # Bug #661812
- mkdir -p Plugins/StreamLinesRepresentation/doc || die
-
- cmake-utils_src_prepare
-
- # lib64 fixes
- sed -i \
- -e "s:/lib/python:/$(get_libdir)/python:g" \
- VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
- sed -i \
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
- ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
- if use qt5; then
- export QT_SELECT=qt5
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
- -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
- -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
- -DBUILD_SHARED_LIBS=ON
- -DCMAKE_VERBOSE_MAKEFILE=ON
-
- -DVTK_Group_StandAlone=ON
- -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE
-
- -DVTK_USE_OGGTHEORA_ENCODER=TRUE
- -DVTK_USE_SYSTEM_CGNS=ON
- -DVTK_USE_SYSTEM_PUGIXML=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
- -DVTK_USE_SYSTEM_GLEW=ON
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_JSONCPP=ON
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LZ4=ON
- -DVTK_USE_SYSTEM_NETCDF=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_PROTOBUF=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226
- -DVTK_USE_SYSTEM_ZLIB=ON
-
- # boost
- -DModule_vtkInfovisBoost="$(usex boost)"
-
- # coprocessing
- -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
-
- # doc
- -DBUILD_DOCUMENTATION="$(usex doc)"
-
- # examples
- -DBUILD_EXAMPLES="$(usex examples)"
-
- # ffmpeg
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
- -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
-
- # mpi
- -DPARAVIEW_USE_ICE_T="$(usex mpi)"
- -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DVTK_Group_MPI="$(usex mpi)"
- -DVTK_XDMF_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
-
- # mysql
- -DModule_vtkIOMySQL="$(usex mysql)"
-
- # offscreen
- -DVTK_USE_X=$(usex !offscreen)
- -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
- -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-
- # plugins
- -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
- -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
- # these are always needed for plugins
- -DModule_vtkFiltersFlowPaths="$(usex plugins)"
- -DModule_vtkPVServerManagerApplication="$(usex plugins)"
- # force this module due to incorrect build system deps wrt bug 460528
- -DModule_vtkUtilitiesProcessXML=ON
-
- # python
- -DModule_pqPython="$(usex python)"
- -DModule_vtkmpi4py="$(usex python)"
- -DModule_vtkPython="$(usex python)"
- -DModule_vtkWrappingPythonCore="$(usex python)"
- -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
- -DXDMF_WRAP_PYTHON="$(usex python)"
-
- # qt5
- -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
- -DModule_vtkGUISupportQtSQL="$(usex qt5)"
- -DModule_vtkRenderingQt="$(usex qt5)"
- -DModule_vtkViewsQt="$(usex qt5)"
- -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
- -DVTK_Group_ParaViewQt="$(usex qt5)"
- -DVTK_Group_Qt="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
- -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
-
- # sqlite
- -DModule_vtksqlite="$(usex sqlite)"
-
- # tcl
- -DModule_vtkTclTk="$(usex tcl)"
-
- # test
- -DBUILD_TESTING="$(usex test)"
-
- # tk
- -DVTK_Group_Tk="$(usex tk)"
- -DVTK_USE_TK="$(usex tk)"
- -DModule_vtkRenderingTk="$(usex tk)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DVTK_USE_SYSTEM_TWISTED=ON
- -DVTK_USE_SYSTEM_AUTOBAHN=ON
- -DVTK_USE_SYSTEM_ZOPE=ON
- )
- fi
-
- if use qt5; then
- mycmakeargs+=(
- -DVTK_USE_QVTK=ON
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
- -DVTK_QT_VERSION=5
- -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
- -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
- -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
- -DVTK_Group_Qt:BOOL=ON
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # remove wrapper binaries and put the actual executable in place
- for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
- if [ -f "${ED}"/usr/lib/"$i" ]; then
- mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
- fi
- done
-
- # install libraries into correct directory respecting get_libdir:
- mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
- mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
- mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
- rmdir "${ED}"/usr/lib_tmp || die
-
- # set up the environment
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
- doenvd "${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}
- }
-
- pkg_postinst() {
- xdg_icon_cache_update
- }
-
- pkg_postrm() {
- xdg_icon_cache_update
- }
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2020-11-25 16:10 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-11-25 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 9905e1b6a085a2fe98b550d775b8ba158f76d8fc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 15:56:59 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 16:10:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9905e1b6
sci-visualization/paraview: Inject path to xmlpatterns, drop QT_SELECT
Closes: https://bugs.gentoo.org/755977
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/paraview-5.8.1-find-xmlpatterns.patch | 38 ++++++++++++++++++++++
sci-visualization/paraview/paraview-5.8.1.ebuild | 2 ++
2 files changed, 40 insertions(+)
diff --git a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
new file mode 100644
index 00000000000..b02107bad7a
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
@@ -0,0 +1,38 @@
+From 7fe2ebc709ecb3e7f3b2aa6fc124dda0622541d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 25 Nov 2020 16:32:56 +0100
+Subject: [PATCH] Make qt_xmlpatterns_executable overridable
+
+So far this relies on fragile guessing of path or binary being in PATH.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMake/ParaViewClient.cmake | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
+index b0dea2b328..13b59cd744 100644
+--- a/CMake/ParaViewClient.cmake
++++ b/CMake/ParaViewClient.cmake
+@@ -512,11 +512,13 @@ function (paraview_client_documentation)
+ endif ()
+
+ include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
+- find_program(qt_xmlpatterns_executable
+- NAMES xmlpatterns-qt5 xmlpatterns
+- HINTS "${Qt5_DIR}/../../../bin"
+- "${Qt5_DIR}/../../../libexec/qt5/bin"
+- DOC "Path to xmlpatterns")
++ if (NOT qt_xmlpatterns_executable)
++ find_program(qt_xmlpatterns_executable
++ NAMES xmlpatterns-qt5 xmlpatterns
++ HINTS "${Qt5_DIR}/../../../bin"
++ "${Qt5_DIR}/../../../libexec/qt5/bin"
++ DOC "Path to xmlpatterns")
++ endif ()
+ mark_as_advanced(qt_xmlpatterns_executable)
+
+ if (NOT qt_xmlpatterns_executable)
+--
+2.29.2
+
diff --git a/sci-visualization/paraview/paraview-5.8.1.ebuild b/sci-visualization/paraview/paraview-5.8.1.ebuild
index 7592f9d169a..d647fcf19ce 100644
--- a/sci-visualization/paraview/paraview-5.8.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.1.ebuild
@@ -107,6 +107,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
"${FILESDIR}"/${PN}-5.8.0-w-vtk-8.2.0-qt-5.15.patch # bug 729348
+ "${FILESDIR}"/${P}-find-xmlpatterns.patch # bug 755977, downstream patch
)
pkg_setup() {
@@ -217,6 +218,7 @@ src_configure() {
-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+ -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
)
fi
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2022-05-25 5:33 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2022-05-25 5:33 UTC (permalink / raw
To: gentoo-commits
commit: 21b10dcf8333205528a096a4ba5223ee0713be60
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 04:08:36 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed May 25 05:32:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b10dcf
sci-visualization/paraview: drop 5.9.0, 5.9.1
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-visualization/paraview/Manifest | 2 -
.../files/paraview-4.0.1-xdmf-cstring.patch | 12 --
.../files/paraview-5.9.0-gcc11-include.patch | 41 ----
sci-visualization/paraview/paraview-5.9.0.ebuild | 238 ---------------------
sci-visualization/paraview/paraview-5.9.1.ebuild | 238 ---------------------
5 files changed, 531 deletions(-)
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 657b09e18500..30d39dae379e 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,3 +1 @@
DIST ParaView-v5.10.1.tar.xz 70218088 BLAKE2B 3134c5df35994a3a153ebd97770066b9963911ae7fb1877681135e01a19c4a879306ae844ef3a29719be5cd509f35117f74eb3c264f1a101fa19180d9a126011 SHA512 1feb855432ea7bc40f77ee214e5877d5170e4f31f520dc7198d72a271506b65a4bc79922875d2c176e54219818a428497c606390a2b9da2770de403bd1593e6c
-DIST ParaView-v5.9.0.tar.xz 62784788 BLAKE2B f07bfce50304b2bfba0de4ba3127d686cf4c32633f8c707fbb2d93c19685f7e8a119ba211e27c29b986ca5b22afab4f57c273077a1c0a7ab0abefa55c8874e28 SHA512 44d93b49449262aa3f068aa990419415c3197916a002555d914efc407ed7ccd57b15b829f0fe711afee780e5e63fb1bd072175fc382f3afd36daecc541c382d5
-DIST ParaView-v5.9.1.tar.xz 62835572 BLAKE2B ba15771de9d972de533627ce3e2c74fd5f25df08884680ea6f1ceea0adb513c024f58e4436691bf17b11728f8e1c09f6ce1d55d9875729169dbc5f4b38c05de8 SHA512 d424e22d962f21c32971ca0001c10c266a1768713a3d0ae9d4c73dc83260c4661326cfbed7773845cf31dedc0474096ed9d6eb8a42ab7677cdde95f9f6abd2f2
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch b/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch
deleted file mode 100644
index 665f40ad4fa7..000000000000
--- a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-gcc header fix
-
---- ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h
-@@ -82,6 +82,7 @@
- # ifdef UNIX
- # include "sys/file.h"
- # include "strings.h"
-+# include <cstring>
- # define STRCASECMP strcasecmp
- # define STRNCASECMP strncasecmp
- # define STRCMP strcmp
diff --git a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
deleted file mode 100644
index d5850073fb94..000000000000
--- a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/789573
---- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
---- a/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ b/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
---- a/VTK/Rendering/Core/vtkColorTransferFunction.cxx
-+++ b/VTK/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
---- a/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ b/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -27,6 +27,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.9.0.ebuild
deleted file mode 100644
index f3ceac1728a1..000000000000
--- a/sci-visualization/paraview/paraview-5.9.0.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="Powerful scientific data visualization application"
-HOMEPAGE="https://www.paraview.org"
-SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
-
-LICENSE="paraview GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost cg doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
-
-RESTRICT="mirror test"
-
-# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-REQUIRED_USE="
- python? ( mpi ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )
- webengine? ( qt5 )
- qt5? ( sqlite )
- ?? ( offscreen qt5 )"
-
-# TODO: Verify that these two are not needed any more for the catalyst
-# module:
-# - dev-python/PyQt5
-# - dev-qt/qtgui:5[-gles2-only]
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp:=
- dev-libs/libxml2:2
- dev-libs/protobuf:=
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5:=[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- ffmpeg? ( media-video/ffmpeg )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( dev-db/mysql-connector-c )
- offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
- !offscreen? ( virtual/opengl )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- mpi? ( dev-python/mpi4py )
- qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] )
- ')
- )
- qt5? (
- dev-qt/designer:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qthelp:5
- dev-qt/qtopengl:5[-gles2-only]
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qttest:5
- dev-qt/qtx11extras:5
- dev-qt/qtxmlpatterns:5
- )
- sqlite? ( dev-db/sqlite:3 )
- tk? ( dev-lang/tk:0= )
- webengine? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- boost? (
- $(python_gen_cond_dep '
- dev-libs/boost[mpi?,${PYTHON_USEDEP}]
- ')
- )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
- "${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use python && python-single-r1_pkg_setup
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
- # Bug #661812
- mkdir -p Plugins/StreamLinesRepresentation/doc || die
-
- cmake_src_prepare
-
- # lib64 fixes
- sed -i \
- -e "s:/lib/python:/$(get_libdir)/python:g" \
- VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
- sed -i \
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
- Remoting/Application/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
- -UBUILD_SHARED_LIBS
- -DPARAVIEW_BUILD_SHARED_LIBS=ON
- -DCMAKE_VERBOSE_MAKEFILE=ON
-
- # boost
- -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
-
- # doc
- -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
-
- # examples
- -DBUILD_EXAMPLES="$(usex examples)"
-
- # ffmpeg
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
-
- # mpi
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
- -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
-
- # mysql
- -DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)"
-
- # offscreen
- -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
- -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
-
- # plugins
- -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
-
- # python
- -DModule_pqPython="$(usex python)"
- -DPARAVIEW_USE_PYTHON="$(usex python)"
-
- # qt5
- -DPARAVIEW_USE_QT="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
- -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)"
-
- # sqlite
- -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
-
- # test
- -DBUILD_TESTING="$(usex test)"
-
- # tk
- -DVTK_USE_TK="$(usex tk)"
- -DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)"
-
- # webengine
- -DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)"
- -DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- if use qt5; then
- mycmakeargs+=(
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
- -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
- -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # remove wrapper binaries and put the actual executable in place
- for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
- if [ -f "${ED}"/usr/lib/"$i" ]; then
- mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
- fi
- done
-
- # set up the environment
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
- doenvd "${T}"/40${PN}
-
- newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
- make_desktop_entry paraview "Paraview" paraview
-
- use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/sci-visualization/paraview/paraview-5.9.1.ebuild b/sci-visualization/paraview/paraview-5.9.1.ebuild
deleted file mode 100644
index f3ceac1728a1..000000000000
--- a/sci-visualization/paraview/paraview-5.9.1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="Powerful scientific data visualization application"
-HOMEPAGE="https://www.paraview.org"
-SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
-
-LICENSE="paraview GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost cg doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
-
-RESTRICT="mirror test"
-
-# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-REQUIRED_USE="
- python? ( mpi ${PYTHON_REQUIRED_USE} )
- mysql? ( sqlite )
- webengine? ( qt5 )
- qt5? ( sqlite )
- ?? ( offscreen qt5 )"
-
-# TODO: Verify that these two are not needed any more for the catalyst
-# module:
-# - dev-python/PyQt5
-# - dev-qt/qtgui:5[-gles2-only]
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp:=
- dev-libs/libxml2:2
- dev-libs/protobuf:=
- dev-libs/pugixml
- media-libs/freetype
- media-libs/glew:0
- media-libs/libpng:0
- media-libs/libtheora
- media-libs/tiff:0=
- sci-libs/cgnslib
- sci-libs/hdf5:=[mpi=]
- >=sci-libs/netcdf-4.2[hdf5]
- >=sci-libs/netcdf-cxx-4.2:3
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- ffmpeg? ( media-video/ffmpeg )
- mpi? ( virtual/mpi[cxx,romio] )
- mysql? ( dev-db/mysql-connector-c )
- offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
- !offscreen? ( virtual/opengl )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/constantly[${PYTHON_USEDEP}]
- dev-python/incremental[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- mpi? ( dev-python/mpi4py )
- qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] )
- ')
- )
- qt5? (
- dev-qt/designer:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qthelp:5
- dev-qt/qtopengl:5[-gles2-only]
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qttest:5
- dev-qt/qtx11extras:5
- dev-qt/qtxmlpatterns:5
- )
- sqlite? ( dev-db/sqlite:3 )
- tk? ( dev-lang/tk:0= )
- webengine? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- boost? (
- $(python_gen_cond_dep '
- dev-libs/boost[mpi?,${PYTHON_USEDEP}]
- ')
- )
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
- "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
- "${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use python && python-single-r1_pkg_setup
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
- # Bug #661812
- mkdir -p Plugins/StreamLinesRepresentation/doc || die
-
- cmake_src_prepare
-
- # lib64 fixes
- sed -i \
- -e "s:/lib/python:/$(get_libdir)/python:g" \
- VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
- sed -i \
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
- Remoting/Application/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
- -UBUILD_SHARED_LIBS
- -DPARAVIEW_BUILD_SHARED_LIBS=ON
- -DCMAKE_VERBOSE_MAKEFILE=ON
-
- # boost
- -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
-
- # doc
- -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
-
- # examples
- -DBUILD_EXAMPLES="$(usex examples)"
-
- # ffmpeg
- -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
- -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
-
- # mpi
- -DPARAVIEW_USE_MPI="$(usex mpi)"
- -DXDMF_BUILD_MPI="$(usex mpi)"
- -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
-
- # mysql
- -DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)"
-
- # offscreen
- -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
- -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
-
- # plugins
- -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
-
- # python
- -DModule_pqPython="$(usex python)"
- -DPARAVIEW_USE_PYTHON="$(usex python)"
-
- # qt5
- -DPARAVIEW_USE_QT="$(usex qt5)"
- -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
- -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
- -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)"
-
- # sqlite
- -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
-
- # test
- -DBUILD_TESTING="$(usex test)"
-
- # tk
- -DVTK_USE_TK="$(usex tk)"
- -DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)"
-
- # webengine
- -DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)"
- -DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)"
- )
-
- if use openmp; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
- fi
-
- if use qt5; then
- mycmakeargs+=(
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
- -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
- -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # remove wrapper binaries and put the actual executable in place
- for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
- if [ -f "${ED}"/usr/lib/"$i" ]; then
- mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
- fi
- done
-
- # set up the environment
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
- doenvd "${T}"/40${PN}
-
- newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
- make_desktop_entry paraview "Paraview" paraview
-
- use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
@ 2024-01-08 23:31 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2024-01-08 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 43ac4e061e2033642bd8c137e0a5753ea6070b53
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 22:48:01 2024 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 23:31:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ac4e06
sci-visualization/paraview: fix compilation
Thanks to Attila Tóth for the patch
Closes: https://bugs.gentoo.org/910541
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
.../paraview/files/paraview-5.11.1-missing-include.patch | 11 +++++++++++
sci-visualization/paraview/paraview-5.11.1.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/sci-visualization/paraview/files/paraview-5.11.1-missing-include.patch b/sci-visualization/paraview/files/paraview-5.11.1-missing-include.patch
new file mode 100644
index 000000000000..d59d78412750
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.11.1-missing-include.patch
@@ -0,0 +1,11 @@
+diff -urNp ParaView-v5.11.1-orig/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp ParaView-v5.11.1-dwok/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp
+--- ParaView-v5.11.1-orig/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp 2023-03-30 16:08:08.000000000 +0200
++++ ParaView-v5.11.1-dwok/VTK/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp 2023-08-26 14:53:20.211944383 +0200
+@@ -33,6 +33,7 @@
+
+ #include <vector>
+ #include <string>
++#include <cstdint>
+
+ #define CPL_DLL
+
diff --git a/sci-visualization/paraview/paraview-5.11.1.ebuild b/sci-visualization/paraview/paraview-5.11.1.ebuild
index 5816780dbe50..b1415ed7b27c 100644
--- a/sci-visualization/paraview/paraview-5.11.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -104,6 +104,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+ "${FILESDIR}"/${P}-missing-include.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-01-08 23:32 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-08 23:31 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2022-05-25 5:33 Matthias Maier
2020-11-25 16:10 Andreas Sturmlechner
2020-04-03 2:49 Matthias Maier
2019-08-05 0:08 Matthias Maier
2019-06-30 18:20 Matthias Maier
2018-07-15 16:09 Andreas Sturmlechner
2018-07-08 2:57 Matthias Maier
2017-06-01 7:36 Matthias Maier
2016-09-22 12:47 Matthias Maier
2016-07-09 18:57 Matthias Maier
2015-09-21 21:36 Matthias Maier
2015-09-20 6:56 Matthias Maier
2015-09-20 4:02 Matthias Maier
2015-09-20 3:04 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox