gentoo resync : 21.07.2018

3 files changed, 164 insertions, 25 deletions

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 4317a15a97d9..02e8a426fe3c 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +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
 DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
-EBUILD paraview-5.5.2.ebuild 8355 BLAKE2B 024db792d3b708049e4bf09a294621e802de48e1d3c0f528330f61431e26e67c75226918a2db3356f7c50990fc0dc44c36ce4dfdbc6c1c353aa3ca21db983f98 SHA512 da6247117d63f194d5d24a3aa1f8ab91b58bceaa5be919a450e0f32d6d9950dac6a0bd94bf47418d23aebaf68d7677999cc31febfe56505acb3b2234675877e7
+EBUILD paraview-5.5.2.ebuild 8235 BLAKE2B 8d2c969d099e1e2b1d18aa4199ce4aca239caa59b57479ced193b27236e19b783394b8822fda673266b925d7a4843f2b9e44717bd5e8f42981bd702b44d7e6c7 SHA512 a35a97f0a0bb6ad724911b0ead4eba48b3b52643d2e0a6f48a45a8d1dda2afed96e498fc57a11b2aa9ffd94dfb7acfe2e26d8f688eac939e23b74ba745198517
 MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
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 000000000000..b4299d4ee370
--- /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 b34d4ec9805e..0c54acaaf605 100644
--- a/sci-visualization/paraview/paraview-5.5.2.ebuild
+++ b/sci-visualization/paraview/paraview-5.5.2.ebuild
@@ -4,22 +4,22 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
+inherit cmake-utils desktop eapi7-ver gnome2-utils python-single-r1 toolchain-funcs
 
-MAIN_PV=$(get_major_version)
-MAJOR_PV=$(get_version_component_range 1-2)
+MAIN_PV=$(ver_cut 0-1)
+MAJOR_PV=$(ver_cut 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"
+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="test"
+
+RESTRICT="mirror test"
 
 REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
 	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
@@ -89,8 +89,7 @@ RDEPEND="
 	tk? ( dev-lang/tk:0= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-util/cmake-3.4
-	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+	boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] )
 	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/${MY_P}"
@@ -99,17 +98,11 @@ 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() {
-	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() {
+	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
 	python-single-r1_pkg_setup
 	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
 }
@@ -164,8 +157,7 @@ src_configure() {
 		-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_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
@@ -254,10 +246,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -283,3 +271,11 @@ src_install() {
 
 	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}