From 7a63ab2293f21dde90d1888b4a341f0d71215964 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Mon, 25 Dec 2017 11:34:06 +0100
Subject: [PATCH] sci-visualization/paraview: [QA] Run cmake-utils_src_prepare

Closes: https://bugs.gentoo.org/639582
Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 sci-visualization/paraview/paraview-5.2.0.ebuild | 10 ++++------
 sci-visualization/paraview/paraview-5.3.0.ebuild | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sci-visualization/paraview/paraview-5.2.0.ebuild b/sci-visualization/paraview/paraview-5.2.0.ebuild
index e699e91e48cb..5abd820a7332 100644
--- a/sci-visualization/paraview/paraview-5.2.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.2.0.ebuild
@@ -102,9 +102,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-
-	default
-	epatch "${PATCHES[@]}"
+	cmake-utils_src_prepare
 
 	# lib64 fixes
 	sed -i \
@@ -125,11 +123,11 @@ src_prepare() {
 		Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die
 
 	# no proper switch
-	use nvcontrol || {
+	if ! use nvcontrol; then
 		sed -i \
 			-e '/VTK_USE_NVCONTROL/s#1#0#' \
 			VTK/Rendering/OpenGL/CMakeLists.txt || die
-	}
+	fi
 }
 
 src_configure() {
@@ -279,7 +277,7 @@ src_install() {
 	cmake-utils_src_install
 
 	# set up the environment
-	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN}
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
 
 	newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
 	make_desktop_entry paraview "Paraview" paraview
diff --git a/sci-visualization/paraview/paraview-5.3.0.ebuild b/sci-visualization/paraview/paraview-5.3.0.ebuild
index 221ba8da9255..ea2160482eaa 100644
--- a/sci-visualization/paraview/paraview-5.3.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.3.0.ebuild
@@ -103,9 +103,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-
-	default
-	epatch "${PATCHES[@]}"
+	cmake-utils_src_prepare
 
 	# lib64 fixes
 	sed -i \
@@ -123,11 +121,11 @@ src_prepare() {
 		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || die
 
 	# no proper switch
-	use nvcontrol || {
+	if ! use nvcontrol; then
 		sed -i \
 			-e '/VTK_USE_NVCONTROL/s#1#0#' \
 			VTK/Rendering/OpenGL/CMakeLists.txt || die
-	}
+	fi
 }
 
 src_configure() {
@@ -277,7 +275,7 @@ src_install() {
 	cmake-utils_src_install
 
 	# set up the environment
-	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN}
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
 
 	newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
 	make_desktop_entry paraview "Paraview" paraview
-- 
2.26.2