gentoo resync : 18.08.2019

6 files changed, 67 insertions, 760 deletions

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index b8d51f59d44d..4a2952788c7f 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,12 +1,7 @@
 AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
-AUX paraview-5.5.2-qt-5.11.patch 6035 BLAKE2B 063f4418bdf5b65946df71350d5dc5bdd4546f93d7a01064f653cbf2eb07af0167a7fbff54f192f4a4a53e554ad48c075ed66f1732dbead65bf0a2c112c92ec7 SHA512 3e6a640c515bb64be1052e41f219630747676be69d40b8695a97d60bc1a94ce9eef629ce9ed93001e019520096fe3b85bd1ad3b5a97b6f207cdedd3e3905e601
-AUX paraview-5.6.1-fix_openmp_4.0.patch 1922 BLAKE2B d1f70b8852baf75fd43898909c6416b35734a63ae0ca7ffd4d0ed14f744ee8295e43bd7646576c7c6c29e58f4c25df04c8f14483ccc947d0946b520ab2315419 SHA512 c65ef5808be1d487624a913891e1f4209af3aa41a23df5e06d19677da5b70ee7c86a8bb92466bff9379dbacff1bca162e7f8dc19bb33c97f0e08def92c91b502
-DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
-DIST ParaView-v5.6.0.tar.gz 54085457 BLAKE2B a99a320f87af19ad4d39336e148f4ab1989225111299341ff3ebb095c652f1392362e42ce90dab8fe7390c44f9200637e76c1076e07d61c7e6cd4aad93df3a83 SHA512 4d7c1b9f5781411cdd290a0ef105221deca1af28bb29b8e6e6c077f3377b110e7c86637c11514559d2d826d36f189d5b5c1caa9e5f9c53820cf35c3ade1ae1f6
+AUX paraview-5.6.1-fix_openmp_4.0.patch 3790 BLAKE2B 1da9193af5022e543d794802c50b868a4cf12f5a0943787d845b9b90540efe63d4952df588dc033a8d60978dd109801c3c791460c020bf811dfa5e1c7e028c07 SHA512 fa197c29d5e175c0f0743d3b820ee1be6cf3b1cff21cc98941d853693c0875e200b0ace67c9405a724c356646d8d302193af2226e936b97688dec553ce673b3d
 DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45
-EBUILD paraview-5.5.2.ebuild 8315 BLAKE2B 874ccb9698bdcb6d0b166bee19189b3a86599ab04aa00ac74f025934cd1c5083558ad467a8ce98b82627f8b2ff44847820105ccd27a8aa65f92f27abc165ce33 SHA512 847beb7f94e582c952142d28e87181d109d147403496e523a92d23932cbd84542bc4cfd5417346037b681d6f0505d21d5160393ca732ca686661d74e13c5a775
-EBUILD paraview-5.6.0-r1.ebuild 8492 BLAKE2B 109d26e85a89bb9f5301e9e4faa9c377e0206b8dc031aaf033858d8b694bfc3693c3d91bea00f8353aa7e4c1aad4c501ed80901cad7673de978fddfd32e48fdd SHA512 7f8fb3f3cef50886ac329ec6ac50785e4fb48357e977381d5906663db40592fc467481998a4d319683bf802d50ec9e6aa0193b5f17ad8c34255421424de732d4
-EBUILD paraview-5.6.1.ebuild 8561 BLAKE2B dc3b1ff6536a6d2105cf83ac5bc4cbd659154913b691663b3fcd170d71f3660cb1fc7a33342fbe2f9bf9e0fca876a5a1f96997e381433d1a62999eab8ae47257 SHA512 9d47d2ab1c784f6d6ee5d21bddc0433c9a959c1467c3d658f2af53dffe33fe91b5b179582c4ad184b745f636546262328e010f11625241f8eb07b802d6a0eca9
+EBUILD paraview-5.6.1.ebuild 8588 BLAKE2B 96a9aa97ea023e9528662d876133fcf472b639ec43c1dbfcd4d9ba5844937eaa9f5098619b6149ba0685702e55447c51004d43d2c9a2d05401f5a3377abd5ec1 SHA512 bd70df1f3dc846485720967851dfa42447d8cfdb9ab58f4ceb332ba5783fa58c3920c1c5fcd989269109c4c3801fbaadb62c19ac309778165a8f38578e520e16
 MISC metadata.xml 817 BLAKE2B 8a28d48b1c9f543a90ca28f59c1f943ab0943c25457749a3f8b9a638b63a6703b8ec339ce35abe1fcca74963fbbddac96742094e036431d57d8763c494e4ac04 SHA512 fcc3c91bde9894d1d49b7845c2aca2b3d7ceba09b503b57405ba870a1a414fe7b280313844a2932d80d8d96987b035d948ce219032710e347181db8e3c9738ca
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 b4299d4ee370..000000000000
--- 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/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
index 515624150315..cf2150708935 100644
--- 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
@@ -1,32 +1,81 @@
-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 @@
+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)
+-    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
 -                            shared(data, doParallel, numThreads, threadData))
-+                            shared(data, doParallel, numThreads, threadData, numVals))
++    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f) shared(
++      data, doParallel, numThreads, threadData) VTKM_OPENMP_SHARED_CONST(numVals))
      {
  
        int tid = omp_get_thread_num();
-@@ -422,7 +422,7 @@
+@@ -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, numValues))
++                          shared(outIdx) VTKM_OPENMP_SHARED_CONST(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 @@
+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)
-+                            shared(size)
-                             schedule(static))
+-                            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.5.2.ebuild b/sci-visualization/paraview/paraview-5.5.2.ebuild
deleted file mode 100644
index 9aa40c78c76a..000000000000
--- a/sci-visualization/paraview/paraview-5.5.2.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2018 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
-	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? ( 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 6f1c6c8e57f7..000000000000
--- a/sci-visualization/paraview/paraview-5.6.0-r1.ebuild
+++ /dev/null
@@ -1,310 +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 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
-	sci-libs/xdmf2
-	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
-)
-
-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
-	}
diff --git a/sci-visualization/paraview/paraview-5.6.1.ebuild b/sci-visualization/paraview/paraview-5.6.1.ebuild
index 9a1a2b03d216..81228ed1c1a2 100644
--- a/sci-visualization/paraview/paraview-5.6.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils desktop python-single-r1 toolchain-funcs xdg-utils
+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)
@@ -83,7 +83,7 @@ RDEPEND="
 		dev-qt/qtopengl:5[-gles2]
 		dev-qt/qtsql:5
 		dev-qt/qttest:5
-		dev-qt/qtwebkit:5
+		dev-qt/qtwebengine:5[widgets]
 		dev-qt/qtx11extras:5
 	)
 	sqlite? ( dev-db/sqlite:3 )