Fix Qt dependencies.

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

4 files changed, 20 insertions, 22 deletions

diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index 270cd77310b7..92f44fb6480b 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texstudio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.17 2013/07/18 13:15:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.18 2013/07/23 13:50:08 kensington Exp $
+
+  23 Jul 2013; Michael Palimaka <kensington@gentoo.org> texstudio-2.6.0.ebuild,
+  texstudio-2.6.2.ebuild:
+  Fix Qt dependencies.
 
 *texstudio-2.6.2 (18 Jul 2013)
 
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 9619c34267c6..5bdc1e2e897b 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,29 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX texstudio-2.5-viewers-use-xdg-open.patch 1311 SHA256 ee8a441cef57db995e3a1e8d3f8abd198c8689717b54bfaca5393bed3fc50790 SHA512 4e8084f7a0eaf75b8828bb6f3f2dbcc18f63c0d750f319347fc427af0ee2f858316c23f34aee396838dcff95610801b300e1a7941db747c1d2a6222a8e27ac81 WHIRLPOOL 93726ae1aed601e01a171f2995b4cd6dc7ece54d5c11456244fa9bc0cc0efb07999eba35fe102c4f2bb7570b2c0f247cdd8a146146358b82dd94f35dfd0f9213
 AUX texstudio-2.6.0-desktop.patch 699 SHA256 65c15ba516d444a51118839cc98abf66fc9f7fbe8a25760577ec0c645ae471c2 SHA512 91432aa75a61f17873e8358f60a1b10a4c7334c4b2d44f9b8b1b03abd64f728a856828b3c45e11d91380bf23dd4a62053fff4d2810ce64ac165741e213dda7c6 WHIRLPOOL b880b968eb8014f84802f578fe85bbddbc9ac25f5baddcdd72c7ff98bd20b4770cb1c7648cecb5066e9031fe8fb0cca4ca085a8a8b6db4ff33a38b490a9c99d6
 AUX texstudio-2.6.0-hunspell-quazip.patch 2545 SHA256 aff0970530a4761bd2c4d1d581b036955c9cc8ba9057a1ef3d017b3dd1685dbb SHA512 e04eccb4341769f61fdbba59244db0c42553ac0a889bde01a85b4596a9c0b4603121c26e048cb95c1f725ade0bbdfcb6c5b81b76b4ac553d676862298b26fc6a WHIRLPOOL 77fbe1899de42d2088ad63656c76cd2a9514457a0b897d1af6ed9bca5ae97d0e2c0fbce237b26d265515055cc41f0205698a9ebdce46966dcec706f01fa67cca
 DIST texstudio-2.6.0.tar.gz 22913723 SHA256 23899dc7d57352f84deb375fefea33e3394f3fc497998abcdba003ef1856fc30 SHA512 e958c8e6bb73d3432cd54610c2ece3120c824c53c0fe2d367f2026fc3149bd837638f803706eacac44f48905032f39ad6792e3afbe721f6664a2b551dfdb47a2 WHIRLPOOL c16c4555ed63addb024b279589db09cd5d70f3af9940c4ae57394a04bc66b0be2bf22702bdba21342ed56be859db4b8943b832f6ec6d44ec96e6215bea2a0d93
 DIST texstudio-2.6.2.tar.gz 22938606 SHA256 5d75dc3a9c5f6c872763fb21daf8d444cf5a665acdc818a96264f96413a71981 SHA512 7956ce430ff0fc6915c9295e3ffb73ed07d21c358b95da7cef48d76435ca27045899aa26f3120e44b81f5db69d4b01b5b666712099c40dcbdc5975a8c711ed76 WHIRLPOOL 31c73b7aa4b33b4fa3b93b20b7fee020191299074a7439e9ecd498c585d7503e25a72f408bf4f031a0bccb30f6940fea8e2f82e9743ad9e1d529a261fa35ba43
-EBUILD texstudio-2.6.0.ebuild 1646 SHA256 d7699d65fda54b9eea56ab98f1ffbec86c89a41360c6744b7de75ee02d585cb7 SHA512 986e7a84669690721b28df3701ef94bc24f819760fec6dae6b16e597ee80d8cf8df6cbb625011d68017d66c73b00077ff13500a594a4e37ebe27a598949aeb1d WHIRLPOOL 934f35948e1dc41e73bfc0fe69086455df0d1498ef308e54d85e57699600f93dc36a0f963b28acd1b6c621a71c745277cc96e0db7cfe3052c0588c2852f52b0a
-EBUILD texstudio-2.6.2.ebuild 1658 SHA256 1a50e254b6d1db4c4ca3e4b5e6fedbe3e8a6b6a176d3413cc5c996fd6cc00c40 SHA512 a72a66e41486657fea12906c2a680fa0108a3050e419c0b00648bfe39ffc78cc1226454c00f9d63ec0e8c908663127db00d66b9d426a454ad11461faf54117cb WHIRLPOOL 571f1556f733a3e837cb7b56778cb5b7b2164312a3362e13934a6b759ab2c58506ca89d9fd49e57c6871eef4ec27361cffcf4b75649510d039dfa0a42938b9f2
-MISC ChangeLog 3972 SHA256 d87dcd0f0611d94aa30e60e2b6aea64d5e38ccacb5b6c160603303286d7ad331 SHA512 370015cf7391982f71427962bdbfca3643db77b619bf18fe4c19e86da893763a32f55c3bbe96df1b179df61bbd46cd9b931d0ce682977e581d97a14d12e182ce WHIRLPOOL c594ddcb9e479471cde4b25690473f4cb7ad7c4efc511b802fbb63ab109a5c7b3e03ec83698c47aafebd2dd06d301220fe0cb6055b9e51f662e30d7e08c59c7e
+EBUILD texstudio-2.6.0.ebuild 1651 SHA256 c7a861fab51b7bf387d76cc4f2475f1550ab1368013a921d417ea42e298e38d6 SHA512 88df3574286d4fd84963a79199a83d78d0a6b4f0e8cca80a9485a8e55a0630010fe9efa05bd67c29970a07fc9ed2bb61c12c96c7ee9ca6065da60313d0a4d09f WHIRLPOOL 28f7b0b303d69b9b1de4ded4eff29ac2cb476ea438beec8468ca6c99c739755e49f232998ea47900598656331aba3bd5c2b48108eda4c5edb7c613be64cc9e40
+EBUILD texstudio-2.6.2.ebuild 1666 SHA256 db4ffa37243910ff0979971e7c585f78f59fb752e2a4176179d02ef2e0143ebc SHA512 1965a540e0a1eb29b4ad1fc140963405364489ea2e1bb6242f314f414ffc03a4b9084910bf943bde908858e0f19b40f5d21f4396068d8a2285e3afa329698aac WHIRLPOOL 50b77b6180814f842606a6049adcd99fe5306cf0b0ee434b5162e61c9807d377605482d702ea7b47c357276f7623815a30bac168c180cd10c2b022e90aa40042
+MISC ChangeLog 4108 SHA256 4286f829d1e4b19c05569d1669a30a57e69fa1f4d88412258c3dee2aaa5b5353 SHA512 93e020d041f3d2764a0c19bc2591e3d9819c49f172a2f145f4317856cbf65dcb719f9c3ae6dac1178a381c736a350365ab08131bf1d013d9c1b2e51050f3fc6c WHIRLPOOL 292c7ff559eb011c5884827e9ba0ef021876e79342362f3792475783041c2af39341ec478b661caa643990e490cdf6ac2acfe20c6e13a8c9e89447ae9f221c80
 MISC metadata.xml 283 SHA256 0c64e26ba93ec0d8dd149b088c63e4448174b2f843c91e1f74ac17c2a5feea27 SHA512 74ce72ee9b32eb81077907416c71890c37d20055481df15f0e056e083fe300701dabf6d8df11aa1ecbed13c1ea167305417050ca2e41f4e1b63e2a434f18c821 WHIRLPOOL ac0ac10f27910c9beb29ab731afbe9bce6c4811fb0a1f787036ae1b0638dbdb6ba2a744b3ad4ca6fa5a649a4a8be082969cbe99c8bcd0cdceea8252a5268df4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR5+p0AAoJELnU8jG9FVireiYP/1FW3tJTuTTH+Ny58Wk0Fp4m
-4gw2eQysQzKX2oLHqHWbD6eW+Tf6QgFFeEqgGaGQaDKksYyx3VWEeRIc3sMqKp7K
-potaiGE9YMuDS5tCs2q5nMTh81jkgd5hKD938UzF3+0YlE6RzmbbbKM+x1QIugkf
-7Cn5o11QPq6x/dl4w4KSOJ5ksPKbYyNNwGhfmPkA9woJjWJHQLNi4f+905jjnz9x
-OGdZMsgapcdUrc0J91xm1T9F+cKYLHF9fO+TBbI7mhO9jQlcT8OWktjy9c4otl+G
-WCLgHn6Ytgk1yrdhFV+lHCdiQJ4wLzmDIlDeCZuKiUdSR3Ci0ky1PfWqx+IKXF1L
-M+v5PGnGuNdyNIPWeuGngLW0jjmrbbFIQFXi6mt8fjvgrjB/zvPrQgyZPfyUkHv7
-UpG1Mct4FqdAfn8QZ9fF+tT9mbHYnd9t5/L/YyvQhiZpsRESTFo7+zhlxytbclcX
-0mWnQ2hS+zspmED7ekmMQjd27lGKV0k0w7G02x823JZdIHp8Jfk+qiDE05aIsade
-CQoXO6aD6t7VuRF88KCtlyXGrVRAr7coShnnTPdFSm9elqa5H//aj9MMEM9Ok60G
-v+W6YMfEg9EsEjdDiZp/gUahswAZDLBs4It44qSvXfZzWqd+fRc7MfjLokl/MG8g
-fun9UlFzYFhfuRqDK5rd
-=pPtV
+iQEcBAEBCAAGBQJR7omaAAoJEMbwO6tnXQ0szIIH/06iOCtN7MGoIMd8af97LtHB
+Isyi9q6bBPGz5XohxUslmLyUjXZ5LD1DWVmKvdzUWFPTU9US+cPhs4wqsGmPn8fH
+KF4B6T6lb/ev70KMzf3U/vfIjXRzxqslz6ZhDwkbtAKb0VVqB1e7NXP/fheg0eZ9
+OR8z3rQauyzsdzpjFIOJI90Dz4MdxZfEuwjeNvTuTEn3MPC84Iw6SDT6amIqBcZ6
+hjeGsHButl0wjHKik81eVJd0vvzP3nc3QX9DYmIN/3l2MZhnDbqRmL0V802DZVsX
+ByHai7GQhJ+EtezFLiRcp2sPTahS/k+ygjHlaueZyu5B54DAcgv9jQSoS2z1MZs=
+=+yYs
 -----END PGP SIGNATURE-----
diff --git a/app-office/texstudio/texstudio-2.6.0.ebuild b/app-office/texstudio/texstudio-2.6.0.ebuild
index 140a138f2b77..16fd72e2b588 100644
--- a/app-office/texstudio/texstudio-2.6.0.ebuild
+++ b/app-office/texstudio/texstudio-2.6.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/app-office/texstudio/texstudio-2.6.0.ebuild,v 1.4 2013/07/18 02:09:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.6.0.ebuild,v 1.5 2013/07/23 13:50:08 kensington Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ COMMON_DEPEND="
 	dev-libs/quazip
 	x11-libs/libX11
 	x11-libs/libXext
-	|| ( <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/qtcore-4.6.1:4
 	>=dev-qt/qtscript-4.6.1:4
 	>=dev-qt/qtsvg-4.6.1:4
diff --git a/app-office/texstudio/texstudio-2.6.2.ebuild b/app-office/texstudio/texstudio-2.6.2.ebuild
index e1fd586f0bd8..4ccc73861fcf 100644
--- a/app-office/texstudio/texstudio-2.6.2.ebuild
+++ b/app-office/texstudio/texstudio-2.6.2.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/app-office/texstudio/texstudio-2.6.2.ebuild,v 1.1 2013/07/18 13:15:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.6.2.ebuild,v 1.2 2013/07/23 13:50:08 kensington Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ COMMON_DEPEND="
 	dev-libs/quazip
 	x11-libs/libX11
 	x11-libs/libXext
-	|| ( <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/qtcore-4.6.1:4
 	>=dev-qt/qtscript-4.6.1:4
 	>=dev-qt/qtsvg-4.6.1:4