sci-visualization/paraview: drop old versions

Package-Manager: Portage-2.3.5, Repoman-2.3.2

9 files changed, 0 insertions, 1269 deletions

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 6a09a1ac9a74..000000000000
--- 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 1b941cfa9431..000000000000
--- 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 be495b4fbb3a..000000000000
--- 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 58ddde97d4fb..000000000000
--- 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 65a5b20d60fd..000000000000
--- 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 531be2f614f0..000000000000
--- 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 b7d3e409cde1..000000000000
--- a/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig	2014-12-23 09:25:35.000000000 +0100
-+++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx	2014-12-24 09:40:31.886953389 +0100
-@@ -1185,7 +1185,7 @@
-     if (bitmap)
-       {
-       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
--      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+      metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
-                                   metaData.descent);
-       }
-     ++heightString;
-@@ -1952,8 +1952,8 @@
-     if (bitmap)
-       {
-       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
--      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
--      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
-+      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
-+      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
-       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
-       }
-     else
diff --git a/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch b/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch
deleted file mode 100644
index 4bc5e546fc9d..000000000000
--- a/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=560670
-http://www.paraview.org/Bug/view.php?id=15655
-
-diff --git a/Qt/Components/CMakeLists.txt b/Qt/Components/CMakeLists.txt
-index c45b4bf..8616a90 100644
---- a/Qt/Components/CMakeLists.txt
-+++ b/Qt/Components/CMakeLists.txt
-@@ -650,7 +650,7 @@ vtk_module_library(${vtk-module}
- #the pqSGExportStateWizard has subclasses that directly access
- #the UI file, and currently we don't have a clean way to break this hard
- #dependency, so for no we install this ui file.
--if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-+if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON)
-   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
-           DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
- endif()
diff --git a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch
deleted file mode 100644
index 6016b8d73370..000000000000
--- a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch
+++ /dev/null
@@ -1,550 +0,0 @@
-diff --git a/VTK/IO/SQL/CMakeLists.txt b/VTK/IO/SQL/CMakeLists.txt
-index a62a0b3..25089d9 100644
---- a/VTK/IO/SQL/CMakeLists.txt
-+++ b/VTK/IO/SQL/CMakeLists.txt
-@@ -28,3 +28,4 @@ set_source_files_properties(
-   )
- 
- vtk_module_library(vtkIOSQL ${Module_SRCS} ${SQLite_SRCS})
-+target_link_libraries(vtkIOSQL -lsqlite3)
-diff --git a/VTK/IO/SQL/module.cmake b/VTK/IO/SQL/module.cmake
-index f00bfd0..db7792f 100644
---- a/VTK/IO/SQL/module.cmake
-+++ b/VTK/IO/SQL/module.cmake
-@@ -5,7 +5,7 @@ vtk_module(vtkIOSQL
-     vtkIOCore
-   PRIVATE_DEPENDS
-     vtksys
--    vtksqlite # We should consider splitting this into a module.
-+#   vtksqlite # We should consider splitting this into a module.
-   TEST_DEPENDS
-     vtkIOLegacy
-     vtkTestingIOSQL
-diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.cxx b/VTK/IO/SQL/vtkSQLiteDatabase.cxx
-index 8651670..07acfc2 100644
---- a/VTK/IO/SQL/vtkSQLiteDatabase.cxx
-+++ b/VTK/IO/SQL/vtkSQLiteDatabase.cxx
-@@ -29,7 +29,7 @@
- #include <fstream>
- #include <sstream>
- 
--#include <vtksqlite/vtk_sqlite3.h>
-+#include <sqlite3.h>
- 
- vtkStandardNewMacro(vtkSQLiteDatabase);
- 
-@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char* password, int mode)
-       }
-     }
- 
--  int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
-+  int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance));
- 
--  if (result != VTK_SQLITE_OK)
-+  if (result != SQLITE_OK)
-     {
-     vtkDebugMacro(<<"SQLite open() failed.  Error code is "
-                   << result << " and message is "
--                  << vtk_sqlite3_errmsg(this->SQLiteInstance) );
-+                  << sqlite3_errmsg(this->SQLiteInstance) );
- 
--    vtk_sqlite3_close(this->SQLiteInstance);
-+    sqlite3_close(this->SQLiteInstance);
-     return false;
-     }
-   else
-@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close()
-     }
-   else
-     {
--    int result = vtk_sqlite3_close(this->SQLiteInstance);
--    if (result != VTK_SQLITE_OK)
-+    int result = sqlite3_close(this->SQLiteInstance);
-+    if (result != SQLITE_OK)
-       {
-       vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
-       }
-@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetTables()
-   if (!status)
-     {
-     vtkErrorMacro(<< "GetTables(): Database returned error: "
--                  << vtk_sqlite3_errmsg(this->SQLiteInstance) );
-+                  << sqlite3_errmsg(this->SQLiteInstance) );
-     query->Delete();
-     return this->Tables;
-     }
-@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetRecord(const char *table)
-   if (!status)
-     {
-     vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
--                  << vtk_sqlite3_errmsg(this->SQLiteInstance) );
-+                  << sqlite3_errmsg(this->SQLiteInstance) );
-     query->Delete();
-     return NULL;
-     }
-@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const char* URL)
- // ----------------------------------------------------------------------
- bool vtkSQLiteDatabase::HasError()
- {
--  return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK);
-+  return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK);
- }
- 
- const char* vtkSQLiteDatabase::GetLastErrorText()
- {
--  return vtk_sqlite3_errmsg(this->SQLiteInstance);
-+  return sqlite3_errmsg(this->SQLiteInstance);
- }
-diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.h b/VTK/IO/SQL/vtkSQLiteDatabase.h
-index 640355a..3e8cd57 100644
---- a/VTK/IO/SQL/vtkSQLiteDatabase.h
-+++ b/VTK/IO/SQL/vtkSQLiteDatabase.h
-@@ -49,7 +49,7 @@
- class vtkSQLQuery;
- class vtkSQLiteQuery;
- class vtkStringArray;
--struct vtk_sqlite3;
-+struct sqlite3;
- 
- class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
- {
-@@ -147,7 +147,7 @@ protected:
-   virtual bool ParseURL(const char* url);
- 
- private:
--  vtk_sqlite3 *SQLiteInstance;
-+  sqlite3 *SQLiteInstance;
- 
-   // We want this to be private, a user of this class
-   // should not be setting this for any reason
-diff --git a/VTK/IO/SQL/vtkSQLiteQuery.cxx b/VTK/IO/SQL/vtkSQLiteQuery.cxx
-index 31a15f1..ea12405 100644
---- a/VTK/IO/SQL/vtkSQLiteQuery.cxx
-+++ b/VTK/IO/SQL/vtkSQLiteQuery.cxx
-@@ -25,7 +25,7 @@
- #include "vtkVariant.h"
- #include "vtkVariantArray.h"
- 
--#include <vtksqlite/vtk_sqlite3.h>
-+#include <sqlite3.h>
- 
- #include <cassert>
- 
-@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery()
- {
-   this->Statement = NULL;
-   this->InitialFetch = true;
--  this->InitialFetchResult=VTK_SQLITE_DONE;
-+  this->InitialFetchResult=SQLITE_DONE;
-   this->LastErrorText = NULL;
-   this->TransactionInProgress = false;
- }
-@@ -61,7 +61,7 @@ vtkSQLiteQuery::~vtkSQLiteQuery()
-     {
-     if (this->Database != NULL)
-       {
--      vtk_sqlite3_finalize(this->Statement);
-+      sqlite3_finalize(this->Statement);
-       this->Statement = NULL;
-       }
-     }
-@@ -128,8 +128,8 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery)
-   if (this->Statement)
-     {
-     vtkDebugMacro(<<"Finalizing old statement");
--    int finalizeStatus = vtk_sqlite3_finalize(this->Statement);
--    if (finalizeStatus != VTK_SQLITE_OK)
-+    int finalizeStatus = sqlite3_finalize(this->Statement);
-+    if (finalizeStatus != SQLITE_OK)
-       {
-       vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
-                       << finalizeStatus);
-@@ -148,19 +148,19 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery)
-       return false;
-       }
- 
--    vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+    sqlite3 *db = dbContainer->SQLiteInstance;
-     const char *unused_statement;
- 
--    int prepareStatus = vtk_sqlite3_prepare_v2(db,
-+    int prepareStatus = sqlite3_prepare_v2(db,
-                                                this->Query,
-                                                static_cast<int>(strlen(this->Query)),
-                                                &this->Statement,
-                                                &unused_statement);
- 
--    if (prepareStatus != VTK_SQLITE_OK)
-+    if (prepareStatus != SQLITE_OK)
-       {
--      this->SetLastErrorText(vtk_sqlite3_errmsg(db));
--      vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message "
-+      this->SetLastErrorText(sqlite3_errmsg(db));
-+      vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message "
-                     << this->GetLastErrorText()
-                     << " on statement: '"
-                     << this->Query << "'");
-@@ -191,31 +191,31 @@ bool vtkSQLiteQuery::Execute()
-     }
-   else
-     {
--    vtk_sqlite3_reset(this->Statement);
-+    sqlite3_reset(this->Statement);
-     }
- 
-   vtkDebugMacro(<<"Execute(): Query ready to execute.");
- 
-   this->InitialFetch = true;
--  int result = vtk_sqlite3_step(this->Statement);
-+  int result = sqlite3_step(this->Statement);
-   this->InitialFetchResult = result;
- 
--  if (result == VTK_SQLITE_DONE)
-+  if (result == SQLITE_DONE)
-     {
-     this->SetLastErrorText(NULL);
-     this->Active = true;
-     return true;
-     }
--  else if (result != VTK_SQLITE_ROW)
-+  else if (result != SQLITE_ROW)
-     {
-     vtkSQLiteDatabase *dbContainer =
-       vtkSQLiteDatabase::SafeDownCast(this->Database);
-     assert(dbContainer != NULL);
- 
--    vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+    sqlite3 *db = dbContainer->SQLiteInstance;
- 
--    this->SetLastErrorText(vtk_sqlite3_errmsg(db));
--    vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message "
-+    this->SetLastErrorText(sqlite3_errmsg(db));
-+    vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message "
-                   << this->GetLastErrorText());
-     this->Active = false;
-     return false;
-@@ -236,7 +236,7 @@ int vtkSQLiteQuery::GetNumberOfFields()
-     }
-   else
-     {
--    return vtk_sqlite3_column_count(this->Statement);
-+    return sqlite3_column_count(this->Statement);
-     }
- }
- 
-@@ -256,7 +256,7 @@ const char * vtkSQLiteQuery::GetFieldName(int column)
-     }
-   else
-     {
--    return vtk_sqlite3_column_name(this->Statement, column);
-+    return sqlite3_column_name(this->Statement, column);
-     }
- }
- 
-@@ -276,22 +276,22 @@ int vtkSQLiteQuery::GetFieldType(int column)
-     }
-   else
-     {
--    switch (vtk_sqlite3_column_type(this->Statement, column))
-+    switch (sqlite3_column_type(this->Statement, column))
-       {
--      case VTK_SQLITE_INTEGER:
-+      case SQLITE_INTEGER:
-         return VTK_INT;
--      case VTK_SQLITE_FLOAT:
-+      case SQLITE_FLOAT:
-         return VTK_FLOAT;
--      case VTK_SQLITE_TEXT:
-+      case SQLITE_TEXT:
-         return VTK_STRING;
--      case VTK_SQLITE_BLOB:
-+      case SQLITE_BLOB:
-         return VTK_STRING; // until we have a BLOB type of our own
--      case VTK_SQLITE_NULL:
-+      case SQLITE_NULL:
-         return VTK_VOID; // ??? what makes sense here?
-       default:
-       {
-       vtkErrorMacro(<<"GetFieldType(): Unknown data type "
--                    << vtk_sqlite3_column_type(this->Statement, column)
-+                    << sqlite3_column_type(this->Statement, column)
-                     <<" from SQLite.");
-       return VTK_VOID;
-       }
-@@ -312,7 +312,7 @@ bool vtkSQLiteQuery::NextRow()
-     {
-     vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
-     this->InitialFetch = false;
--    if (this->InitialFetchResult == VTK_SQLITE_DONE)
-+    if (this->InitialFetchResult == SQLITE_DONE)
-       {
-       return false;
-       }
-@@ -323,12 +323,12 @@ bool vtkSQLiteQuery::NextRow()
-     }
-   else
-     {
--    int result = vtk_sqlite3_step(this->Statement);
--    if (result == VTK_SQLITE_DONE)
-+    int result = sqlite3_step(this->Statement);
-+    if (result == SQLITE_DONE)
-       {
-       return false;
-       }
--    else if (result == VTK_SQLITE_ROW)
-+    else if (result == SQLITE_ROW)
-       {
-       return true;
-       }
-@@ -336,8 +336,8 @@ bool vtkSQLiteQuery::NextRow()
-       {
-       vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
-       assert(dbContainer != NULL);
--      vtk_sqlite3 *db = dbContainer->SQLiteInstance;
--      this->SetLastErrorText(vtk_sqlite3_errmsg(db));
-+      sqlite3 *db = dbContainer->SQLiteInstance;
-+      this->SetLastErrorText(sqlite3_errmsg(db));
-       vtkErrorMacro(<<"NextRow(): Database returned error code "
-                     << result << " with the following message: "
-                     << this->GetLastErrorText());
-@@ -363,33 +363,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtkIdType column)
-     }
-   else
-     {
--    switch (vtk_sqlite3_column_type(this->Statement, column))
-+    switch (sqlite3_column_type(this->Statement, column))
-       {
--      case VTK_SQLITE_INTEGER:
--        return vtkVariant(vtk_sqlite3_column_int(this->Statement, column));
-+      case SQLITE_INTEGER:
-+        return vtkVariant(sqlite3_column_int(this->Statement, column));
- 
--      case VTK_SQLITE_FLOAT:
--        return vtkVariant(vtk_sqlite3_column_double(this->Statement, column));
-+      case SQLITE_FLOAT:
-+        return vtkVariant(sqlite3_column_double(this->Statement, column));
- 
--      case VTK_SQLITE_TEXT:
-+      case SQLITE_TEXT:
-       {
-       std::ostringstream str;
--      str << vtk_sqlite3_column_text(this->Statement, column);
-+      str << sqlite3_column_text(this->Statement, column);
-       return vtkVariant(vtkStdString(str.str()));
-       }
- 
--      case VTK_SQLITE_BLOB:
-+      case SQLITE_BLOB:
-       {
-       // This is a hack ... by passing the BLOB to vtkStdString with an explicit
-       // byte count, we ensure that the string will store all of the BLOB's bytes,
-       // even if there are NULL values.
- 
-       return vtkVariant(vtkStdString(
--        static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)),
--        vtk_sqlite3_column_bytes(this->Statement, column)));
-+        static_cast<const char*>(sqlite3_column_blob(this->Statement, column)),
-+        sqlite3_column_bytes(this->Statement, column)));
-       }
- 
--      case VTK_SQLITE_NULL:
-+      case SQLITE_NULL:
-       default:
-         return vtkVariant();
-       }
-@@ -420,11 +420,11 @@ bool vtkSQLiteQuery::BeginTransaction()
-   vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
-   assert(dbContainer != NULL);
- 
--  vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+  sqlite3 *db = dbContainer->SQLiteInstance;
-   char *errorMessage = NULL;
--  int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
-+  int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage);
- 
--  if (result == VTK_SQLITE_OK)
-+  if (result == SQLITE_OK)
-     {
-     this->TransactionInProgress = true;
-     this->SetLastErrorText(NULL);
-@@ -448,7 +448,7 @@ bool vtkSQLiteQuery::CommitTransaction()
- {
-   if (this->Statement)
-     {
--    vtk_sqlite3_finalize(this->Statement);
-+    sqlite3_finalize(this->Statement);
-     this->Statement = NULL;
-     }
- 
-@@ -460,11 +460,11 @@ bool vtkSQLiteQuery::CommitTransaction()
- 
-   vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
-   assert(dbContainer != NULL);
--  vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+  sqlite3 *db = dbContainer->SQLiteInstance;
-   char *errorMessage = NULL;
--  int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
-+  int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage);
- 
--  if (result == VTK_SQLITE_OK)
-+  if (result == SQLITE_OK)
-     {
-     this->TransactionInProgress = false;
-     this->SetLastErrorText(NULL);
-@@ -496,11 +496,11 @@ bool vtkSQLiteQuery::RollbackTransaction()
- 
-   vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
-   assert(dbContainer != NULL);
--  vtk_sqlite3 *db = dbContainer->SQLiteInstance;
-+  sqlite3 *db = dbContainer->SQLiteInstance;
-   char *errorMessage = NULL;
--  int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
-+  int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage);
- 
--  if (result == VTK_SQLITE_OK)
-+  if (result == SQLITE_OK)
-     {
-     this->TransactionInProgress = false;
-     this->SetLastErrorText(NULL);
-@@ -644,11 +644,11 @@ bool vtkSQLiteQuery::BindIntegerParameter(int index, int value)
-   if (this->Active)
-     {
-     this->Active = false;
--    vtk_sqlite3_reset(this->Statement);
-+    sqlite3_reset(this->Statement);
-     }
--  int status = vtk_sqlite3_bind_int(this->Statement, index+1, value);
-+  int status = sqlite3_bind_int(this->Statement, index+1, value);
- 
--  if (status != VTK_SQLITE_OK)
-+  if (status != SQLITE_OK)
-     {
-     std::ostringstream errormessage;
-     errormessage << "sqlite_bind_int returned error: " << status;
-@@ -673,11 +673,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(int index, vtkTypeInt64 value)
-   if (this->Active)
-     {
-     this->Active = false;
--    vtk_sqlite3_reset(this->Statement);
-+    sqlite3_reset(this->Statement);
-     }
--  int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
-+  int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value));
- 
--  if (status != VTK_SQLITE_OK)
-+  if (status != SQLITE_OK)
-     {
-     std::ostringstream errormessage;
-     errormessage << "sqlite_bind_int64 returned error: " << status;
-@@ -702,12 +702,12 @@ bool vtkSQLiteQuery::BindDoubleParameter(int index, double value)
-   if (this->Active)
-     {
-     this->Active = false;
--    vtk_sqlite3_reset(this->Statement);
-+    sqlite3_reset(this->Statement);
-     }
- 
--  int status = vtk_sqlite3_bind_double(this->Statement, index+1, value);
-+  int status = sqlite3_bind_double(this->Statement, index+1, value);
- 
--  if (status != VTK_SQLITE_OK)
-+  if (status != SQLITE_OK)
-     {
-     std::ostringstream errormessage;
-     errormessage << "sqlite_bind_double returned error: " << status;
-@@ -731,12 +731,12 @@ bool vtkSQLiteQuery::BindStringParameter(int index, const char *value, int lengt
-   if (this->Active)
-     {
-     this->Active = false;
--    vtk_sqlite3_reset(this->Statement);
-+    sqlite3_reset(this->Statement);
-     }
- 
--  int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT);
-+  int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT);
- 
--  if (status != VTK_SQLITE_OK)
-+  if (status != SQLITE_OK)
-     {
-     std::ostringstream errormessage;
-     errormessage << "sqlite_bind_text returned error: " << status;
-@@ -760,17 +760,17 @@ bool vtkSQLiteQuery::BindBlobParameter(int index, const void *data, int length)
-   if (this->Active)
-     {
-     this->Active = false;
--    vtk_sqlite3_reset(this->Statement);
-+    sqlite3_reset(this->Statement);
-     }
- 
-   int status =
--    vtk_sqlite3_bind_blob(this->Statement,
-+    sqlite3_bind_blob(this->Statement,
-                           index+1,
-                           data,
-                           length,
--                          VTK_SQLITE_TRANSIENT);
-+                          SQLITE_TRANSIENT);
- 
--  if (status != VTK_SQLITE_OK)
-+  if (status != SQLITE_OK)
-     {
-     std::ostringstream errormessage;
-     errormessage << "sqlite_bind_blob returned error: " << status;
-@@ -794,12 +794,12 @@ bool vtkSQLiteQuery::ClearParameterBindings()
-   if (this->Active)
-     {
-     this->Active = false;
--    vtk_sqlite3_reset(this->Statement);
-+    sqlite3_reset(this->Statement);
-     }
- 
--  int status = vtk_sqlite3_clear_bindings(this->Statement);
-+  int status = sqlite3_clear_bindings(this->Statement);
- 
--  if (status != VTK_SQLITE_OK)
-+  if (status != SQLITE_OK)
-     {
-     std::ostringstream errormessage;
-     errormessage << "sqlite_clear_bindings returned error: " << status;
-diff --git a/VTK/IO/SQL/vtkSQLiteQuery.h b/VTK/IO/SQL/vtkSQLiteQuery.h
-index bfab39a..db4deb4 100644
---- a/VTK/IO/SQL/vtkSQLiteQuery.h
-+++ b/VTK/IO/SQL/vtkSQLiteQuery.h
-@@ -47,7 +47,7 @@
- class vtkSQLiteDatabase;
- class vtkVariant;
- class vtkVariantArray;
--struct vtk_sqlite3_stmt;
-+struct sqlite3_stmt;
- 
- class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
- {
-@@ -155,7 +155,7 @@ private:
-   vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
-   void operator=(const vtkSQLiteQuery &); // Not implemented.
- 
--  vtk_sqlite3_stmt *Statement;
-+  sqlite3_stmt *Statement;
-   bool InitialFetch;
-   int InitialFetchResult;
-   char *LastErrorText;
-diff --git a/VTK/ThirdParty/sqlite/CMakeLists.txt b/VTK/ThirdParty/sqlite/CMakeLists.txt
-index 9e1c067..a55764b 100644
---- a/VTK/ThirdParty/sqlite/CMakeLists.txt
-+++ b/VTK/ThirdParty/sqlite/CMakeLists.txt
-@@ -1,4 +1,4 @@
--set(vtksqlite_THIRD_PARTY 1)
--set(vtksqlite_LIBRARIES vtksqlite)
--vtk_module_export_info()
--add_subdirectory(vtksqlite)
-+#set(vtksqlite_THIRD_PARTY 1)
-+#set(vtksqlite_LIBRARIES sqlite3)
-+#vtk_module_export_info()
-+#add_subdirectory(vtksqlite)
-diff --git a/VTK/ThirdParty/sqlite/module.cmake b/VTK/ThirdParty/sqlite/module.cmake
-index 8dbb3a7..db837c5 100644
---- a/VTK/ThirdParty/sqlite/module.cmake
-+++ b/VTK/ThirdParty/sqlite/module.cmake
-@@ -1 +1 @@
--vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)
-+#vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING)