gentoo resync : 25.11.2020

3 files changed, 67 insertions, 32 deletions

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 74c6929306e7..5cdb670e448c 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -2,8 +2,9 @@ AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad
 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.8.0-w-vtk-8.2.0-qt-5.15.patch 1185 BLAKE2B 9573a94af926615a3e6e8e043ea5bbbbf7a7946e33bce30c9fe6475de074142043463c345cf6caed09a60a63c241cac19ca2a54383b41752441b72e0bf5d9f17 SHA512 3552ae966be577840187590c651abc98e41047cbac6b679a17779b83b37c8d1ddd1a36a6ddd6dffb01b66138d2fc8a1bd335afb3ee488d2faa60c7ec1e4323e0
+AUX paraview-5.8.1-find-xmlpatterns.patch 1343 BLAKE2B 6786f27d4a3d5539f0265d1b3426b16063e795fca57d51ac3d232e5258d4d3db1b765379607ba143a422fe8f49b12354edc51fd4f4700a709e2e4aa362e75b8c SHA512 08aa76bdb1251638d52a2871116f507cc492cf03895a1950e05a56048571edb932efebe0f7704d56cd61afadee8f1f9e7003bc02825df83550944f84265b1658
 DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2
 DIST ParaView-v5.8.1.tar.xz 49822084 BLAKE2B 1b99392a85c19fdc02f8f9f0f055fb7efd8a0b17eedfd84005d1af9b170c34ec4eedb25700f91c3a2241ee80e271fe1e744e3a729b7726deb8f9c7a9fd2e4191 SHA512 94861c01da2f98c47e7453d072a4de34a7f52f5df280a8745b44d58d8d6a1dba42a15d0bac31895bbe25f23d993d4d356e5af1f8415137e289afd60570070248
 EBUILD paraview-5.8.0-r3.ebuild 6343 BLAKE2B d3136156a23fd16e9a8f7fdfaf1f413819ea710930834bc530934f58248b7909e41bdf49f825d7931960053c76b088016221aa4618b4313ebabe8ec3f80ccc8c SHA512 a4ae8e081d988d834569107f4295a3a9becc3f12b9c9739280097a75543c72ccf6eb2ccee00fb892fbee64bc578d09a454c57b12bc0b63f051d0825753c453fb
-EBUILD paraview-5.8.1.ebuild 6297 BLAKE2B 44274ab639f45e19cfafe884c3cc28a224b0d88e4dc1cd3dccc4fbca21300a0384c0944a828390248dc4cd619115ad75737c5636b4f6ef505fe88733fb4088d5 SHA512 23c2b09aa00a653583297d76bd5784e9309008a37e53fbf7f14407f04ea664910c60aeaded4b9deb07b5736381b11da5fb73f9697c89b382a794f329bd7dbb78
+EBUILD paraview-5.8.1.ebuild 6365 BLAKE2B 3da5abe853e0d3276b17583dde843f4ab01251e20b29d466e1299e81d3ab10928dab1fa0d765063e2363185ea7e5037fdfe23b6a04e9b1241f072cdb0606b51f SHA512 a525ce60d1d086a059aaa2f245217a473c954d462090085d0d0c35d7aff6e81654a491d5eef3517d05bf49743045c3e310f19b6f806b61e1ce872aa71d4c8205
 MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
new file mode 100644
index 000000000000..b02107bad7a7
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
@@ -0,0 +1,38 @@
+From 7fe2ebc709ecb3e7f3b2aa6fc124dda0622541d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 25 Nov 2020 16:32:56 +0100
+Subject: [PATCH] Make qt_xmlpatterns_executable overridable
+
+So far this relies on fragile guessing of path or binary being in PATH.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMake/ParaViewClient.cmake | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
+index b0dea2b328..13b59cd744 100644
+--- a/CMake/ParaViewClient.cmake
++++ b/CMake/ParaViewClient.cmake
+@@ -512,11 +512,13 @@ function (paraview_client_documentation)
+   endif ()
+ 
+   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
+-  find_program(qt_xmlpatterns_executable
+-    NAMES xmlpatterns-qt5 xmlpatterns
+-    HINTS "${Qt5_DIR}/../../../bin"
+-          "${Qt5_DIR}/../../../libexec/qt5/bin"
+-    DOC   "Path to xmlpatterns")
++  if (NOT qt_xmlpatterns_executable)
++    find_program(qt_xmlpatterns_executable
++      NAMES xmlpatterns-qt5 xmlpatterns
++      HINTS "${Qt5_DIR}/../../../bin"
++            "${Qt5_DIR}/../../../libexec/qt5/bin"
++      DOC   "Path to xmlpatterns")
++  endif ()
+   mark_as_advanced(qt_xmlpatterns_executable)
+ 
+   if (NOT qt_xmlpatterns_executable)
+-- 
+2.29.2
+
diff --git a/sci-visualization/paraview/paraview-5.8.1.ebuild b/sci-visualization/paraview/paraview-5.8.1.ebuild
index fec2161a4d14..21cee95dc062 100644
--- a/sci-visualization/paraview/paraview-5.8.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs
+inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
 MAJOR_PV=$(ver_cut 1-2)
@@ -15,8 +15,8 @@ HOMEPAGE="https://www.paraview.org"
 SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
 
 LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
 
 RESTRICT="mirror test"
@@ -106,10 +106,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
 	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
 	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${PN}-5.8.0-w-vtk-8.2.0-qt-5.15.patch # bug 729348
+	"${FILESDIR}"/${P}-find-xmlpatterns.patch # bug 755977, downstream patch
 )
 
-CMAKE_MAKEFILE_GENERATOR="emake" #579474
-
 pkg_setup() {
 	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
 	use python && python-single-r1_pkg_setup
@@ -117,11 +117,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-
 	# Bug #661812
 	mkdir -p Plugins/StreamLinesRepresentation/doc || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# lib64 fixes
 	sed -i \
@@ -133,10 +132,6 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt5; then
-		export QT_SELECT=qt5
-	fi
-
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
 		-UBUILD_SHARED_LIBS
@@ -219,36 +214,37 @@ src_configure() {
 			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
 			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
 			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
-		# remove wrapper binaries and put the actual executable in place
-		for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
-			if [ -f "${ED}"/usr/lib/"$i" ]; then
-				mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
-			fi
-		done
+	# remove wrapper binaries and put the actual executable in place
+	for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+		if [ -f "${ED}"/usr/lib/"$i" ]; then
+			mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+		fi
+	done
 
-		# set up the environment
-		echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
-		doenvd "${T}"/40${PN}
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+	doenvd "${T}"/40${PN}
 
-		newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
-		make_desktop_entry paraview "Paraview" paraview
+	newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
 
-		use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-	}
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
 
-	pkg_postinst() {
-		xdg_icon_cache_update
-	}
+pkg_postinst() {
+	xdg_icon_cache_update
+}
 
-	pkg_postrm() {
-		xdg_icon_cache_update
-	}
+pkg_postrm() {
+	xdg_icon_cache_update
+}