Add x11-libs/qt-sql to deps, #301684

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index aafd63982f2b705616468413686b054f795545e6..baa1c80868ed24bb0dcd4a1536dd23f7e8ee3eea 100644 (file)
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.66 2010/04/25 11:33:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.67 2010/05/22 09:19:22 jlec Exp $
+
+  22 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild,
+  vtk-5.4.2-r1.ebuild:
+  Add x11-libs/qt-sql to deps, #301684
 
   25 Apr 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild:
   Python ABI fixes, #316229

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index d6120422c333d75071ea7d3364e3f7e48e5c3a99..ecce8cbe78254b376e5da237e44120fff729bca6 100644 (file)
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
 AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
@@ -7,7 +10,14 @@ AUX vtk-5.4.2-libpng14.patch 548 RMD160 14217aaaad0b1d44d25574084ee2d3c75d52fbec
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
 DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
-EBUILD vtk-5.4.2-r1.ebuild 6434 RMD160 16dccc704472e74cf472810fd843849e774ae6fb SHA1 e5ff02754c176870da930e6f677fad9204e1f61b SHA256 206656d61c9b5368cd75314de98344db06eb35fe62716e3e54ccb7566548cdea
-EBUILD vtk-5.4.2.ebuild 9228 RMD160 48166d46b398bf602298f075f7c2503b889e2bab SHA1 a910c5ab6ea24e337ec81e655e2cbf703091f62a SHA256 4916278ab6b193e7fe49b5629e629d9133da4f5b2d67dd7cec9ffc1682c485b0
-MISC ChangeLog 11048 RMD160 ac5244c3fc3444db390d6656fa5cef968220c2f9 SHA1 f7b9c2e3119c72a4bfb124ac66f083d72ddd32bd SHA256 cf5cfc34907b1868bfe63f3091e75890fa767eb5394028210c6d56b3795e5f9c
+EBUILD vtk-5.4.2-r1.ebuild 6440 RMD160 a77fedd6b2dca0c1866dc71725f6c480b3a7dd05 SHA1 857fb573a1c85fee35ce6359d293820eb04b0870 SHA256 e2840f507b89bdcac967ca7d5d969addf47eba0825a9b3566e0dca5ec54cc69b
+EBUILD vtk-5.4.2.ebuild 9247 RMD160 3547c38a9a64f5ac3c2d0fd206698211dfa7e08e SHA1 2153b18b06f54d908c220aaec2e3e61574c8e31a SHA256 5cd83226710f1aece303f35860107d079732139ee73e5dc10d14fe661fc3735a
+MISC ChangeLog 11176 RMD160 6550c0275cca306586ca4ac14a7989194963ea16 SHA1 d66c27224c2d69647f972e3c4cedf3b737648ffc SHA256 0f6ac2ac8ec904fac1c538396cbfb550cfa58e49218d308ce61fedad0e164506
 MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkv3oaAACgkQgAnW8HDreRamfgCfaDgGs+91GdhVAv8rSEIctRI+
+A5sAnRvGoazOR7GW/+5/qEo4e+NBZhyc
+=Q08v
+-----END PGP SIGNATURE-----

diff --git a/sci-libs/vtk/vtk-5.4.2-r1.ebuild b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
index 18ff14116249a1eacf32acfb245ba846e379eb00..a956a1eca5a417d065b98eb2a79a5bd417ab3e6a 100644 (file)
--- a/sci-libs/vtk/vtk-5.4.2-r1.ebuild
+++ b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.9 2010/05/21 18:34:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.10 2010/05/22 09:19:22 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -31,7 +31,8 @@ RDEPEND="mpi? ( || (
        java? ( >=virtual/jre-1.5 )
        qt4? ( x11-libs/qt-core:4
                        x11-libs/qt-opengl:4
-                       x11-libs/qt-gui:4 )
+                       x11-libs/qt-gui:4
+                       x11-libs/qt-sql )
        examples? ( x11-libs/qt-core:4[qt3support]
                        x11-libs/qt-gui:4[qt3support] )
        dev-libs/expat
@@ -56,7 +57,6 @@ pkg_setup() {
        einfo "using parallel make. Hence, if you experience a build"
        einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first."
        echo
-       epause 5
 
        java-pkg-opt-2_pkg_setup
 

diff --git a/sci-libs/vtk/vtk-5.4.2.ebuild b/sci-libs/vtk/vtk-5.4.2.ebuild
index 4a28cf47ddbc3e7774b8218a790a57c8e4ccb456..de617f47fa0942e7ec37eba3e32bf55d9d943a96 100644 (file)
--- a/sci-libs/vtk/vtk-5.4.2.ebuild
+++ b/sci-libs/vtk/vtk-5.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.7 2010/03/26 12:40:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2.ebuild,v 1.8 2010/05/22 09:19:22 jlec Exp $
 
 EAPI="2"
 inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt4
@@ -29,7 +29,8 @@ RDEPEND="mpi? ( || (
        java? ( >=virtual/jre-1.5 )
        qt4? ( x11-libs/qt-core:4
                        x11-libs/qt-opengl:4
-                       x11-libs/qt-gui:4 )
+                       x11-libs/qt-gui:4
+                       x11-libs/qt-sql:4 )
        examples? ( x11-libs/qt-core:4[qt3support]
                        x11-libs/qt-gui:4[qt3support] )
        dev-libs/expat