Fix Qt dependencies.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 26 insertions, 8 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index ce9e22316350..da38b893ede5 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.109 2013/07/16 05:28:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.110 2013/07/23 14:12:22 kensington Exp $
+
+  23 Jul 2013; Michael Palimaka <kensington@gentoo.org> vtk-5.10.0.ebuild,
+  vtk-5.10.1.ebuild:
+  Fix Qt dependencies.
 
   16 Jul 2013; Patrick Lauer <patrick@gentoo.org> vtk-5.10.0.ebuild,
   vtk-5.10.1.ebuild:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 28e00bf6f0d0..a19d2052b43b 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX vtk-5.10.1-ffmpeg-1.patch 1626 SHA256 312402db11bbc47d1596a5c58ee127af6a5807dda2331df402ebcfe7e999ea7c SHA512 34a59c7229a9dbd63d2c346906536fc1d53965489ecb148b57fd2b4b71e7b428d3bd162aa008cc92d72c006720217bf9c72863f761b7cd9b7e2241be8c52f327 WHIRLPOOL 5319732317a82df89d37914f831bf516e66ff58cd5a4a7d2ae777d732590af6ec5f8dd9d90a59ac8f46c1e228483081ade46e0ee02c2bb6ce713fbfc4ce3c669
 AUX vtk-5.10.1-libav-9.patch 3474 SHA256 688b58df16c0fada2ef5ccca8c53a8029bd6b3a6eaaddec3a210ac880cba2120 SHA512 f22d8c215aa23b9e719598b034657a61092d326dd7e2ef0e7e68a1ff0d33e1a6523e0ae85fbc2a1e72c869a295b257563daef0842f67b27716ab2652d03bb447 WHIRLPOOL 2a0cf463926b4e06df02942a0f63aeb0a659da6f1ba85a456485691199de48d418ce2c222f39a3b69876961491bf3bcacb8b1272793e3f7785771cd474e8cb75
 AUX vtk-5.10.1-tcl8.6.patch 2339 SHA256 b4f3800267e77589267b6121820f0df4764b970dee75f256cdfb13a721ee1163 SHA512 0f7c53bbc2012ab2d2ad296adc305dcd3fcdb1cc47e8015c656b8b2cc626dcc0e61149bdaeb66945c19c6533a610a41cfc03d3b117d6959c2b7e32ae3da77564 WHIRLPOOL 6a8c3548cee051e97a975efe62f40c24aaa26e3d1a7afa2cde50ff19913ba6cb8eaf5fe9f0ce8febb7a1f0482b48917b5d26505bc2f40d3d560cada7865d25a2
@@ -23,7 +26,18 @@ DIST vtkDocHtml-5.10.0.tar.gz 176529461 SHA256 28d7e1bfc9f9a4d225d15b9f46cec18f8
 DIST vtkDocHtml-5.10.1.tar.gz 178278963 SHA256 1447d7e07a615c0c6d66cce2bfc6b2f4a6eaec03c132d13345d225ee6f309944 SHA512 c1c8bf1b3c94ab79b1661b3197788ded31c3aef5114d830866ed0a6dd90d3a6c50ed27cd7840a512065ad2b15fd8bcbc61787fbbd00216a1becb2419eb172735 WHIRLPOOL b3ba92938fb4894522c5b930767b4e4c11756e1aae1c100a42ab4a592f7d4a848ea1996b3956c26cb17cce4cb0fd43d8c92efec42a802e318439a653bcc398e9
 DIST vtkdata-5.10.0.tar.gz 88635192 SHA256 3b2e44feea87f57dc356e924863f8b787a42627c92838138b376b383b4915b2c
 DIST vtkdata-5.10.1.tar.gz 88642678 SHA256 c526a5eeb73693597043a89d401ef5b8f0c6f6eddb82e03ad205f013ee9edf7c SHA512 3655ecd4bd6f05e3266c19d67c59867e12d4681e159869b7673948a8ba3966f958bd1a1ef024321b66f3ad649b80fc62e5323f8bd700d34fdd95645e7fe5ef32 WHIRLPOOL b65e533dc3a092ae4944bfd1ca850ab3b7ba95c62c654e0c03ac8c689d4270eaf58ae91519200c00b94ad3108f4ce3bc16656bf62a7e10dc627dea736594831d
-EBUILD vtk-5.10.0.ebuild 7491 SHA256 f18cda630add049053715d4619df031cf4d337c6b8fa43f7cc23a16a9e4bdd1f SHA512 8b8ba9021cb8a338f12dc273b00035ba6c75ff22068ee5d293a10090199e2fa2e0fa8501654cb6c5e3e33afea4ce795e16fe0047492414636b664ecdb0258777 WHIRLPOOL 9f044724110a57d98c211752f1891a7fb387a333afd3532a17aca042c35c7698c7e084518a606292c226b60e42135e648abae1e109b05f7218ff6eaea18eb747
-EBUILD vtk-5.10.1.ebuild 7603 SHA256 49cd21143c3e2419bd6f63ec009078a2e5b46f7e717e2592847abaf932f7f49f SHA512 d766c236f9bfeee430d68ea72c2e5e6dccb60cfac6a9deac6064dedc59bdd74533e8fac3060105f43c16adcbc5f5b1b63a2d78a93438deeb02415e75b2eefee6 WHIRLPOOL ec4ff66ddb19aa311df3c0844f5c950d51fed4a91b02d49e81dd0abeae4dcf9729a6b32b91b56f2601de3731714d7183d65018e908437c96af5817bcdd4696f5
-MISC ChangeLog 17764 SHA256 69e05aebf14071cc07edd0d84f2d858d8e0a9b7cc139eafd79a47dd58fa8be03 SHA512 9f1d198ae1609815e19f749d8f36dfd11d78484a5e1c7d39a03eca53c9dc912d211b7b67b00804b3c52cfca6194692b191b60c215fbeb020146d04602a9cb076 WHIRLPOOL f17c9012326016486309f1672f7106f387e8547d1d9fef9ac6d3fe16e34002c5c9433ea884318be9933fb1beac5003d65ea9c1c270fb3a3ee365d9578b8a62e1
+EBUILD vtk-5.10.0.ebuild 7496 SHA256 95590f599548bc7b2123823a2f5bd7a121d614d5ba19cb30f0eccfe0083528a1 SHA512 9105fff6f53161454dd7f7d3d36b6f5de5e6a53af0e317181913ff0c453e7274829768f1bdceaa171744d37c1cdce75da3fd414d27abcafec4e1d48c39811b47 WHIRLPOOL 7c826421edeb3367e37843f294229ef0071637d93dc79cb3749a85c2a4a5a8c5417a21e132a746c39b5f2441d7dea2bd145b97ed91b3c4672f8a39e15199d1a9
+EBUILD vtk-5.10.1.ebuild 7608 SHA256 afd98fb01d1d391397d4ee22d8fb302e1fd63002944d8a78363aa74ffb057750 SHA512 c30578c4363dfa973ac6e47642ba9ca89e81ecc4f8603e8bc73456334887e430ccc13249628524d5797932cb46833f16ba1453a5819350ab96e4d0ff98e5aa12 WHIRLPOOL 57541ba69ade0992fb9a13cad13e2938c77e905a2954e2009c60ddbbdca632bfed7e52ae62ff07504a80c5dca49ad5822c9d3c0c41ae1f97709c6e8bb5a2bf78
+MISC ChangeLog 17887 SHA256 a7950bd9221e71df77adb9b649376a8487aa283f08301e10486e1d9a74b7116f SHA512 a32e25fb1e64edab25295bd4c8291c627232ce5bb1d047446ae8bf51eea4c7f6674971fb9a8215c5c23a56cba99dff2092c6026f0c53603910538629508f6b44 WHIRLPOOL 87f15f249d59ab55316f7e8cf4dc5d8815b6d9970fb3d6ec4fb0363395c652308676e70c6fc884b9458a64cd0fa62b1c7da4d960f1ec23c67c124ae6bbc3d16e
 MISC metadata.xml 563 SHA256 2fedd09c2e8b8c709641c6490e9b4ea9190d4c98cafa958386ed957bc8687ce9 SHA512 cb5a7f2db34a3e35a7115240ad21fce20bf771613dc42fe57c8e0ea1d004ea40e06fb57970285ebcca290bb390b29c10d7aa5d20a3df7e8dfeb314db152c3152 WHIRLPOOL 2540838d0c619af440b8269a46c58045cb6c79e73525b75ea891af381f7561c106712a1881c62cd0d4de7ddd7cc6926ab7c5a7ea59adfa7ebfb312dd1712ec45
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR7o7TAAoJEMbwO6tnXQ0sx7sH/R9Vz+OFYD8077Z/OuD2mCaP
+ubzSQ2Vrz50dmwR4o5pbq2VZzt189LQVKqBTplkN1UzNd9j3nTG41FOWoeZtR2cZ
+kgYeYrpyYHRPB3WpxH3GidCfbaaJGLfeLkOTRMltga4dByJQzZd6gmLp3FXshRQE
+1T0TMtAD2C24iLCa2UscvDoCMpfLZ8oa/ZHuWU4lCcAJG8TML82MRp0ppe8NxUNq
+LJvAzGxql3Dt5Dz9xjADxpNTr5aG7w/f7dUc3Umu/j1L8vQzHkoC6Y9WDjQehuz+
+zhwXkd+qHheLX9ik6S8iYAQ7AQz1QoJUA1WvJR1dgmK1UAqLo5sYZghFgQeYUls=
+=rRym
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/vtk-5.10.0.ebuild b/sci-libs/vtk/vtk-5.10.0.ebuild
index c0c8994728ed..ada5230d0f51 100644
--- a/sci-libs/vtk/vtk-5.10.0.ebuild
+++ b/sci-libs/vtk/vtk-5.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.0.ebuild,v 1.4 2013/07/16 05:28:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.0.ebuild,v 1.5 2013/07/23 14:12:22 kensington Exp $
 
 EAPI=3
 
@@ -51,7 +51,7 @@ RDEPEND="
 	python? ( dev-python/sip )
 	qt4? (
 		dev-qt/qtcore:4
-		|| ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+		|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
 		dev-qt/qtopengl:4
 		dev-qt/qtsql:4
 		dev-qt/qtwebkit:4
diff --git a/sci-libs/vtk/vtk-5.10.1.ebuild b/sci-libs/vtk/vtk-5.10.1.ebuild
index 6a3980464cb2..31b46b7ac7d6 100644
--- a/sci-libs/vtk/vtk-5.10.1.ebuild
+++ b/sci-libs/vtk/vtk-5.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.8 2013/07/16 05:28:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.9 2013/07/23 14:12:22 kensington Exp $
 
 EAPI=3
 
@@ -51,7 +51,7 @@ RDEPEND="
 	python? ( dev-python/sip )
 	qt4? (
 		dev-qt/qtcore:4
-		|| ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+		|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
 		dev-qt/qtopengl:4
 		dev-qt/qtsql:4
 		dev-qt/qtwebkit:4