Add missing slot dependencies on Qt.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 26 insertions, 29 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 132e0a0d5330..6949e365eb84 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.144 2012/07/06 20:52:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.145 2012/07/15 16:37:26 kensington Exp $
+
+  15 Jul 2012; Michael Palimaka <kensington@gentoo.org> marble-4.8.3.ebuild,
+  marble-4.8.4.ebuild:
+  Add missing slot dependencies on Qt.
 
   06 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> marble-4.8.3.ebuild,
   marble-4.8.4.ebuild:
@@ -593,4 +597,3 @@
   18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   +files/marble-4.0.0-fix-tests.patch, +metadata.xml, +marble-4.0.0.ebuild:
   Added KDE 4.0.0's marble.
-
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index 49a03cf935c5..43e0df56ebd4 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX marble-4.7-magic-r1.patch 1801 SHA256 9d5a32d90f0a00492ef53ff523abfb25729f1d23d0ce213be6e6fa96edb31cbe SHA512 358766a373434770bf169fc89e88f4b8ff096364ccc2732c0c1a2d344334a2023fef784ce4d19e13fae74d0705091cf9f40ed29d10228d0ac69fa8f15314ec46 WHIRLPOOL 45e07b2eb02afc4563da99ce06855172d83168ff9c37e03deadec45e2345701daed77fa412aaa1e13b2459352926b3d54f5eb370a1cfab939e163f533074cc67
 AUX marble-4.8.0-lower-qt48.patch 896 SHA256 5e0ca071923ca2c77a625dac6bb3a5731d4c1f8c8ed08a70ab3b4490b305946f SHA512 f637403a7617985a2f7cd8363829f4461f0bb2d87f9a6cb57db5482d67f126bb7576999170f6ab64661ea0042499f4420e4e8ffe7566b5f863fe77a073b14a95 WHIRLPOOL 0aca6931dd2442e1588d6da496f543d02b103f22de8009c1483ea7b1b9f1115d016ba6b963b9c110d1f2c401d7667d293552c387471677bacb19048c6d82aeb6
@@ -8,24 +8,18 @@ DIST marble-4.7.4.tar.bz2 21068089 SHA256 e6a735cceca8cb2df9bff7c79b7af35dca4c3f
 DIST marble-4.8.3.tar.xz 19899712 SHA256 1aae47e3c5365fc922d0c0e50aded329930f43be43c19d35345c8c20c8aff9a8
 DIST marble-4.8.4.tar.xz 19899160 SHA256 3e5e7db5b69b3cdebcb0b76bded572a6e824b5a770f16b5b9f7f193f1e0df026 SHA512 63d32e3b226a2004d78873bfb92cc3b1b66d0dc9d815070dbadf928a46a48a97e1b31a8fe30857de1cc5c8203834c1515c459fcfdb7cd762a47295baa6781e32 WHIRLPOOL 2f5a5707a39474266d9ba8b92f579a29c0106f6d4bb4159bcdb2ec813652ec8f73ed5d826f4bb2488dff1935e46d7fc5ab2207db62d53720a72e85a3bf0d5bb3
 EBUILD marble-4.7.4.ebuild 1491 SHA256 e81866bb394bc91f0dffca30d9cd94a04987dc39bccfaed302c7e4da214af49c SHA512 8821b0869805738b6fe24c713e69f506c848c2e128ddea8177c1a032b47a7cfe59b40bc806a7776e5769564ee0cae61cdff41a800891a4d6a5afe70b39967735 WHIRLPOOL caba8c45d2618e8dcf8a11aa112f54335d792931c98083f429eaa2041a707e9bf84a2649e753d62c9e2530bfd41698cb145561fc62ab208dd378dcdecbb7d67b
-EBUILD marble-4.8.3.ebuild 1776 SHA256 c2531af391f8e59abe550a037de09e1dddfe5933d08d865cf42ac167c01a5fd3 SHA512 f88ce39d89b0a68de58327971aea11c58c79c64e698527e38ef68e64333ade66a1a25ec46f1bbf287bf94ffe844f698c3d2f15f874f011de42094ed9bf9dff59 WHIRLPOOL 5aeb882fe014bfd78d253511bf6866b94030bac77d52be6de6eb361e75611a23e2eeb063a84829dbaec09b974da35b30a8fd2047bca4da418114eeb05e19fa75
-EBUILD marble-4.8.4.ebuild 1764 SHA256 a9d16f16d422840f9f1c55edc7d1f75ff6680ea592af9947e8a8dfc0ffc4a508 SHA512 ab96801ecb50bd8f79d50862da0cede32ef7c2f1571d0f19c7e5541c56922390b07e0891c8d8711631fe33b244cf0d4321d7660d04591efb91e5cfd7ac45b772 WHIRLPOOL 8f39dedbe957a6856dbef38c75d4642ea79254fd29b4bfe327a7b0049a8997ea7eceb428940be1ee23d650cd3bb5ed2e7af5beba7f7087b45847fb2b2f4019c8
-MISC ChangeLog 18287 SHA256 cb8f7766f60700104fdba9e3c313ee7a88270909bc835aa402741406dc274335 SHA512 8638d37fb39be17b0425d52cd944ac08de5b1ee66ec6baba2619bcca52697d69156eca698cb064ba9f1c244be1e959d85bca5d9b5dff3ae7553c77a8758db42f WHIRLPOOL d934a513fce5c0adf0886ed1313c368c695cb2872ec3a71d5dcc7f8692024bb730b20b9d3b4c598223d0ba7b2cdd59c9e7a8deed855bf4eefc34ccf87bb2c39d
+EBUILD marble-4.8.3.ebuild 1785 SHA256 1ae8f2e2c890af6321b68236adc80da90e715bcd3d77f2fee302a9d3186acaf6 SHA512 cb5e9afa6954d3346702925fd599d6c5bc11e56069eaace6456428e3aa159dc196d37f02607503efe89cc594b7e234d6f1fd5f85ba386d3f12a1fd0926a95eeb WHIRLPOOL 387f05af46675cac03af41b09c97b624662938518d90d0e84bb08a03d8f3b18d84ddc474ce643c4f74012a25f0b9e86d290ae37b318fda9337b278af68659195
+EBUILD marble-4.8.4.ebuild 1773 SHA256 ecf7b3d05a5a371acb040c88c112c0628c3903df1b8be98bf032f2acd3aa05e8 SHA512 91b79578549b35c800161c3c66c70e07b9673ba57a8528c7244eed5ef3b0ceb3bfdf559dccf5c2b8d2c166abf5e78601823362e92af8394f372acddf91e19ad7 WHIRLPOOL 489f084147b2fb8a1bb31763f909e0ed1a90db566f1eeaa308f9ecd4f906622dc2eb0c91b0a6e36894934dcf1b7a3a43924f7a63c10bab16a9ac6454c068a3cc
+MISC ChangeLog 18427 SHA256 0d8ea8506614166585737ed3ca9884b6ef01dd93fa53665113141d2683521fe0 SHA512 e7e7e1aba77af7a63a6ab6e7960c8ab869c1ec283957b196d1d4942a661c7d8bf42bdbbc51f886016d2edb6dde0859a1f2924b7c5afc8bca5985d2a9f53d6ccb WHIRLPOOL 96fa85b71ad13edb66a208f34c19714d3a210609045198a827662561a729bfa4c4a998282f34e2bcb0f156e6f8d30902cf616ebfaa6257a348e668bc8fa8971b
 MISC metadata.xml 229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2 SHA512 0824ec11d907a418ee37b7dd21fa51943143061e34b28cb87cfe692296d2da9e0070867260932e08251c0e11313d488e733b316aa9ab6f54edf9e3c62f173cf6 WHIRLPOOL d2ae923ececb6422c3629256e13af59578bcc76cd28b6d70115baf1bacb4bf49db7b4c46c14d455fad9f275fa6c9b5080407206ab69ad8618ae90287b158e74a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP91B6AAoJENwGBM22xffeH6cP/2+Sc3fK0f3MAQQyw5ZNsjp+
-9YiWDMYHrahTbcRYgxRvX0CRx89nO0JDvKyHGyr32WFHoGzUHK0HaoGxj2PQQUXA
-NUtfMIV2jHwoRyhE4Pm1uoSLwxeBO5h3SK3iVG+cFCycggG847+g4Fw6OffSIto8
-w8AIda/lggPdMKessMyd1uS5y7j9IvXNQU7zfSsiuGUjdVv725TnN+Z9k/wp4LR5
-JJAewZkAhxMZlbhLlN0CKOaqlSqGzcS3yaAeyqa4bJjgU9aNj6zIyXgV4G1xcRiQ
-y7N5LKh27yW3TSB9lOs6cbqQ5BDx/nDHm41IWS/l4/8c3pUUJRrGLEdAnpNYzpMm
-mQbepNt94++WLCQ6A5ZKu9heBtAY5rPmlXUiyZJptbb6Sw1sC2ESGdxg0GqMUuPQ
-guDgP8RAB8C5iiY9U6az8ffrgviE+X1+np8hvuYs8UUYGRotNMUShFaFk3GyGqaw
-TsXFqtnhofeKA1vLngwnvBu21W4pzITwtHLCwFss51PpTa6m+yS5ujiXRTaLhs+W
-HtztWNlIsz4z8xVLcF7Y8tB1jQTzrJm30Tj4IqM6bg/obuLwDqtx1rWQX9Vt33ni
-V8nRPSBzR5VZ7WO/xUNixR5tJpryY9JHeKNk/k+EwvxlKOXP3I5yOG+jwPm4tzCe
-s0lMaHzoy+9e2M3+Bao4
-=pspj
+iQEcBAEBAgAGBQJQAvHCAAoJEMbwO6tnXQ0sEhAH/0RRpb/jHn/RmIBPcM2T9+RU
+mOB47ZxFyYKw1qe5zM6Of+0106S0FY6iwsJiFPp5WT/sLBnyKfOMZz4H9mZly6pY
+UGYg2aihuGBOmIOrHjrwemoKvLGv+CIfoGd+qULIPz4yLJJBGUj292Y/DU0+YIkq
+U783F6qUEzIDlIHh8u73FPiSnK9QrbPSSxatHzO2G/GyV5EbOuWCT3se0n7OuTiR
+AFP2oGPHhBWRSakn8EdbiHG+a9g6qAenAF8/vbqQuvc9VqwEwAtTk18FPBd6e2zk
+oOFry8P/ShPsEYCkbl3Lzor3AYM0/kb8blf9e0cDviPryQaqhITOj4Kt8G1WVZ8=
+=8GEz
 -----END PGP SIGNATURE-----
diff --git a/kde-base/marble/marble-4.8.3.ebuild b/kde-base/marble/marble-4.8.3.ebuild
index 208c06487794..02115da35caf 100644
--- a/kde-base/marble/marble-4.8.3.ebuild
+++ b/kde-base/marble/marble-4.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.8.3.ebuild,v 1.6 2012/07/06 20:52:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.8.3.ebuild,v 1.7 2012/07/15 16:37:26 kensington Exp $
 
 EAPI=4
 
@@ -19,10 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-script
-	x11-libs/qt-webkit
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
diff --git a/kde-base/marble/marble-4.8.4.ebuild b/kde-base/marble/marble-4.8.4.ebuild
index 87a0bb2f554c..ad3a6746fbe8 100644
--- a/kde-base/marble/marble-4.8.4.ebuild
+++ b/kde-base/marble/marble-4.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.8.4.ebuild,v 1.2 2012/07/06 20:52:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.8.4.ebuild,v 1.3 2012/07/15 16:37:26 kensington Exp $
 
 EAPI=4
 
@@ -18,10 +18,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-script
-	x11-libs/qt-webkit
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1