aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Bissey <francois.bissey@canterbury.ac.nz>2012-12-17 20:54:59 +1300
committerFrançois Bissey <francois.bissey@canterbury.ac.nz>2012-12-17 20:54:59 +1300
commite0b568f7df3167f0aac8408161132cc893a2f987 (patch)
treeda4b0662d4fe0a3c160c81d5d73838d303827307 /sci-visualization
parentMoved to tree (diff)
downloadsci-e0b568f7df3167f0aac8408161132cc893a2f987.tar.gz
sci-e0b568f7df3167f0aac8408161132cc893a2f987.tar.bz2
sci-e0b568f7df3167f0aac8408161132cc893a2f987.zip
Sort webkit dep in paraview 3.14
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/paraview/ChangeLog4
-rw-r--r--sci-visualization/paraview/paraview-3.14.1-r4.ebuild8
2 files changed, 8 insertions, 4 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index f5ecfaf0a..3e1d9065c 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 17 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+ paraview-3.14.1-r4.ebuild:
+ sort webkit dependencies
+
*paraview-3.14.1-r4 (20 Sep 2012)
20 Sep 2012; François Bissey <francois.bissey@canterbury.ac.nz>
diff --git a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild b/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
index 0f65b02d2..77c2d5c5e 100644
--- a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
+++ b/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
@@ -20,7 +20,7 @@ RESTRICT="mirror"
LICENSE="paraview GPL-2"
KEYWORDS="~x86 ~amd64"
SLOT="0"
-IUSE="boost cg -coprocessing doc examples +gui mpi mysql gl2ps nvcontrol +plugins +python webkit ffmpeg theora"
+IUSE="boost cg -coprocessing doc examples +gui mpi mysql gl2ps nvcontrol +plugins +python ffmpeg theora"
RDEPEND="
~sci-libs/netcdf-4.1.3[cxx,hdf5]
@@ -32,14 +32,14 @@ RDEPEND="
x11-libs/qt-opengl:4
|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
x11-libs/qt-sql:4
- webkit? ( x11-libs/qt-webkit:4 ) )
+ x11-libs/qt-webkit:4 )
mysql? ( virtual/mysql )
coprocessing? ( plugins? (
x11-libs/qt-gui:4
dev-python/PyQt4 ) )
python? (
dev-python/sip
- gui? ( dev-python/PyQt4 )
+ gui? ( dev-python/PyQt4[opengl,webkit] )
dev-python/numpy
mpi? ( dev-python/mpi4py )
)
@@ -176,7 +176,7 @@ src_configure() {
if ( use gui ); then
mycmakeargs+=(
-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer
- $(cmake-utils_use webkit VTK_QT_USE_WEBKIT))
+ -DVTK_QT_USE_WEBKIT=ON )
if use python ; then
# paraview cannot guess sip directory right probably because a path is not propagated properly
mycmakeargs+=(