sci-visualization/paraview: Update to new qt deps names

Package-Manager: portage-2.2.0_alpha164

5 files changed, 58 insertions, 54 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 58ffdf4d8..df874d135 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-visualization/paraview
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Mar 2013; Justin Lecher <jlec@gentoo.org> paraview-3.10.1.ebuild,
+  paraview-3.12.0.ebuild, paraview-3.14.1-r4.ebuild, metadata.xml:
+  Update to new qt deps names
+
   19 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz>
   paraview-3.14.1-r4.ebuild, files/paraview-3.14.1-vtknetcd.patch:
   Fix forgotten instances of vtkNetCDF
diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml
index 5a805e383..38ea062d7 100644
--- a/sci-visualization/paraview/metadata.xml
+++ b/sci-visualization/paraview/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>markusle@gentoo.org</email>
-		<name>Markus Dittrich</name>
-	</maintainer>
-	<use>
-		<flag name='plugins'>Build and install additional plugins</flag>
-		<flag name='gui'>Build paraview's gui not just the server</flag>
-		<flag name='cg'>Add support for nvidia's cg shaders</flag>
-                <flag name="boost">Add support for boost</flag>
-		<flag name='streaming'>Enable streaming paraview application</flag>
-		<flag name='adaptive'>Enable the adaptive paraview application</flag>
-		<flag name='mysql'>Build support for MySQL data item in the XDMF format</flag>
-		<flag name='nvcontrol'>Add NVCONTROL support for OpenGL options</flag>
-		<flag name='webkit'>Built support for qt-webkit in vtk</flag>
-		<flag name='gl2ps'>Enables gl2ps PostScript printing library</flag>
-		<flag name='coprocessing'>Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag>
-	</use>
+  <herd>sci</herd>
+  <maintainer>
+    <email>markusle@gentoo.org</email>
+    <name>Markus Dittrich</name>
+  </maintainer>
+  <use>
+    <flag name="plugins">Build and install additional plugins</flag>
+    <flag name="gui">Build paraview's gui not just the server</flag>
+    <flag name="cg">Add support for nvidia's cg shaders</flag>
+    <flag name="boost">Add support for boost</flag>
+    <flag name="streaming">Enable streaming paraview application</flag>
+    <flag name="adaptive">Enable the adaptive paraview application</flag>
+    <flag name="mysql">Build support for MySQL data item in the XDMF format</flag>
+    <flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag>
+    <flag name="webkit">Built support for qt-webkit in vtk</flag>
+    <flag name="gl2ps">Enables gl2ps PostScript printing library</flag>
+    <flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-visualization/paraview/paraview-3.10.1.ebuild b/sci-visualization/paraview/paraview-3.10.1.ebuild
index 4dd9f3aa3..ec894f308 100644
--- a/sci-visualization/paraview/paraview-3.10.1.ebuild
+++ b/sci-visualization/paraview/paraview-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -26,21 +26,21 @@ RDEPEND="
 	sci-libs/hdf5[mpi=]
 	mpi? ( virtual/mpi[cxx,romio] )
 	gui? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-qt3support:4
-		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 ) )
+		dev-qt/qtgui:4
+		dev-qt/qt3support:4
+		dev-qt/qtopengl:4
+		|| ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 )
+		dev-qt/qtsql:4
+		webkit? ( dev-qt/qtwebkit:4 ) )
 	adaptive? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-assistant:4
-		webkit? ( x11-libs/qt-webkit:4 ) )
+		dev-qt/qtgui:4
+		dev-qt/qt3support:4
+		dev-qt/qtopengl:4
+		dev-qt/qthelp:4
+		webkit? ( dev-qt/qtwebkit:4 ) )
 	mysql? ( virtual/mysql )
-	coprocessing? ( plugins? ( x11-libs/qt-gui:4 ) )
-	python? ( 
+	coprocessing? ( plugins? ( dev-qt/qtgui:4 ) )
+	python? (
 		dev-python/sip
 		dev-python/PyQt4
 	)
diff --git a/sci-visualization/paraview/paraview-3.12.0.ebuild b/sci-visualization/paraview/paraview-3.12.0.ebuild
index 8f59eff36..d8bb82697 100644
--- a/sci-visualization/paraview/paraview-3.12.0.ebuild
+++ b/sci-visualization/paraview/paraview-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -26,20 +26,20 @@ RDEPEND="
 	sci-libs/hdf5[mpi=]
 	mpi? ( virtual/mpi[cxx,romio] )
 	gui? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-qt3support:4
-		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 ) )
+		dev-qt/qtgui:4
+		dev-qt/qt3support:4
+		dev-qt/qtopengl:4
+		|| ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 )
+		dev-qt/qtsql:4
+		webkit? ( dev-qt/qtwebkit:4 ) )
 	adaptive? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-qt3support:4
-		x11-libs/qt-opengl:4
-		x11-libs/qt-assistant:4
-		webkit? ( x11-libs/qt-webkit:4 ) )
+		dev-qt/qtgui:4
+		dev-qt/qt3support:4
+		dev-qt/qtopengl:4
+		dev-qt/qthelp:4
+		webkit? ( dev-qt/qtwebkit:4 ) )
 	mysql? ( virtual/mysql )
-	coprocessing? ( plugins? ( x11-libs/qt-gui:4 ) )
+	coprocessing? ( plugins? ( dev-qt/qtgui:4 ) )
 	python? (
 		dev-python/sip
 		dev-python/PyQt4
diff --git a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild b/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
index 2475bcc3e..4d13a8703 100644
--- a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
+++ b/sci-visualization/paraview/paraview-3.14.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -27,15 +27,15 @@ RDEPEND="
 	sci-libs/hdf5[mpi=]
 	mpi? ( virtual/mpi[cxx,romio] )
 	gui? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-qt3support:4
-		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
-		x11-libs/qt-webkit:4 )
+		dev-qt/qtgui:4
+		dev-qt/qt3support:4
+		dev-qt/qtopengl:4
+		|| ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 )
+		dev-qt/qtsql:4
+		dev-qt/qtwebkit:4 )
 	mysql? ( virtual/mysql )
 	coprocessing? ( plugins? (
-			x11-libs/qt-gui:4
+			dev-qt/qtgui:4
 			dev-python/PyQt4 ) )
 	python? (
 		dev-python/sip