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

diff --git a/sci-visualization/paraview/paraview-5.2.0.ebuild b/sci-visualization/paraview/paraview-5.2.0.ebuild
index e699e91e48cbf85c733a5dd000d107e774c3b639..5abd820a733228b7603d9c0594417d2a9b1956dc 100644 (file)
--- 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 221ba8da9255a9342f564de76fb25ff27700f521..ea2160482eaae3c68294927cc38b354ae1c1ff75 100644 (file)
--- 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