From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EF2D138806 for ; Mon, 25 Dec 2017 10:43:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89FD6E0CA4; Mon, 25 Dec 2017 10:43:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A541E0CA4 for ; Mon, 25 Dec 2017 10:43:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A10433FE7D for ; Mon, 25 Dec 2017 10:43:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54AA4AEAA for ; Mon, 25 Dec 2017 10:43:48 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1514198589.7a63ab2293f21dde90d1888b4a341f0d71215964.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/paraview/paraview-5.2.0.ebuild sci-visualization/paraview/paraview-5.3.0.ebuild X-VCS-Directories: sci-visualization/paraview/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7a63ab2293f21dde90d1888b4a341f0d71215964 X-VCS-Branch: master Date: Mon, 25 Dec 2017 10:43:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7163e80b-5dc4-4cf1-978f-efbf6629402c X-Archives-Hash: b544b2a821532de4c69df4bd5eaa7818 commit: 7a63ab2293f21dde90d1888b4a341f0d71215964 Author: David Seifert gentoo org> AuthorDate: Mon Dec 25 10:34:06 2017 +0000 Commit: David Seifert gentoo 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