commit: 7a63ab2293f21dde90d1888b4a341f0d71215964 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon Dec 25 10:34:06 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 25 10:43:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a63ab22
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 e699e91e48c..5abd820a733 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 221ba8da925..ea2160482ea 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
