Fix dependencies, thanks to Bash Vi <bash.vi@gmail.com> in bug #429346.

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

4 files changed, 47 insertions, 25 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 429797bd1809..44e7b42d9f90 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.146 2012/08/01 22:17:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.147 2012/08/02 16:55:46 kensington Exp $
+
+  02 Aug 2012; Michael Palimaka <kensington@gentoo.org> marble-4.8.4.ebuild,
+  marble-4.9.0.ebuild:
+  Fix dependencies, thanks to Bash Vi <bash.vi@gmail.com> in bug #429346.
 
 *marble-4.9.0 (01 Aug 2012)
 
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index a8042ffb80b4..72bcffda91fe 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -10,18 +10,18 @@ DIST marble-4.8.4.tar.xz 19899160 SHA256 3e5e7db5b69b3cdebcb0b76bded572a6e824b5a
 DIST marble-4.9.0.tar.xz 19822060 SHA256 82da30dce72c4e722f51b917282a9c887df22cb24c1e6139f523818ed7d25d37 SHA512 f416d5c9a5a7a3e78a1b593cbe7f28dc13b78b64079aa4d498d22e998250d937006d7a06ff7b2963f2998227a987a3976148aa05c3901ba3cd5b946424c64190 WHIRLPOOL 075d1b6e268797cdc3c5bf3b884715fdb9014d37cf0a060ecbe94cd8757db5d443f2a5248686357b3e479a8262b77203719ac2d6a0db85e7131e31d4b4bb0c55
 EBUILD marble-4.7.4.ebuild 1491 SHA256 e81866bb394bc91f0dffca30d9cd94a04987dc39bccfaed302c7e4da214af49c SHA512 8821b0869805738b6fe24c713e69f506c848c2e128ddea8177c1a032b47a7cfe59b40bc806a7776e5769564ee0cae61cdff41a800891a4d6a5afe70b39967735 WHIRLPOOL caba8c45d2618e8dcf8a11aa112f54335d792931c98083f429eaa2041a707e9bf84a2649e753d62c9e2530bfd41698cb145561fc62ab208dd378dcdecbb7d67b
 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
-EBUILD marble-4.9.0.ebuild 1769 SHA256 ffbf54b06b57a402df941be4f55fa72e0bdbda890ce7ae9ddfab80d61e75961d SHA512 2442c4d5e35b6ff74a2c011bd627548d4411b65162dc42d984e5e721c6174ab99b3226fca2e1f7c9f71ba191ad61778ae2240a4387eac488394012bbc10d0eb2 WHIRLPOOL 1005ee2aa09bbe14cf13127f0002f0d3ccbccf071e3e6df8fb8567e0bfa762d31fae4375e634cb961fb8290c1ee71f9b802d28482a684f16b1e7bc52af45889a
-MISC ChangeLog 18549 SHA256 7741988348fdd6341ab9af4f5721f625e910dcbc7e7f28c5638a4c5a7f9ec8d4 SHA512 f80ba48aa8282e21439789b6c4d6990e6b4fa934cf06674bb329b2d8910248cafeca399cc4949356464dc0ab70cba0c53e54d1b57ced0bc2f9c7a10102492ab2 WHIRLPOOL 03efaf16b01fe6e612bd97f4cb8089c276796af428093596850edd11fe22c247e96a7530d2335e2aefe613cfa97ba2f922b020aced7a91cfd5d3d25c9ddff4d7
+EBUILD marble-4.8.4.ebuild 1965 SHA256 987f4ffab7319517934bc852d4033a5c2914754e6e9467b51e8d62a2f0ea1859 SHA512 7f41135314050c0df37d6e1bf183739d82fee3c213a1a1326d84f4291cefa645ef85fe4847ad9c6f1f78c457cc2b53c2a83ff0bf13bc375988f921a90f91ae29 WHIRLPOOL bb97d626bf9d3a048c5d60729ecd96ee3fd055de2c892823dccf5fdb0f794e1659936c23ebaa429185888834340a3ddbce4df9f67ff9d43582350bd23cb1dac4
+EBUILD marble-4.9.0.ebuild 1967 SHA256 71c223eaaa43de9bdd7a6d368572f0bf72e8545770e83827af7922bd012ab96b SHA512 cd485ee65b1b0ff481d5d022743ef249709ddf208456a737ffdc299060ba09c0f97e4a77380f1c2ea34ff616345833b9c4dca3b8e17af9a3bf9ad004f58eb397 WHIRLPOOL b8f86b807eaf6679273c95fcf35165424b28a0eec787e48fde9ff5f6ac046bad88da7859911307a2f9e06aacadbb2b2e670572084be1b8e1a4048426aec6bca1
+MISC ChangeLog 18730 SHA256 a32c276071f9563be9ff768bc58073719e8dc76d62c5186b75db804384c60d41 SHA512 243bdcdc63db56629f57be58577bfcc99cf3c8a92af25b8faa4ca74c66ddf370061e90f75ace4c00e9fef2c5332bad675460f1b4522fc4f3955575b6373fccf4 WHIRLPOOL 13717343e1448ad9715a4f150c81727edc33dd2f064c5f2c9140f939a568e5e7ff65bd6813dde54d4d94b59952dd16dbc7daaf02efbbb91d780473795c9cc5fe
 MISC metadata.xml 229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2 SHA512 0824ec11d907a418ee37b7dd21fa51943143061e34b28cb87cfe692296d2da9e0070867260932e08251c0e11313d488e733b316aa9ab6f54edf9e3c62f173cf6 WHIRLPOOL d2ae923ececb6422c3629256e13af59578bcc76cd28b6d70115baf1bacb4bf49db7b4c46c14d455fad9f275fa6c9b5080407206ab69ad8618ae90287b158e74a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQGatvAAoJEO+t9ga+3I3aU9AIALIgQj2w8aTOjLvtqhVJvHNk
-YCfgAWWP3NPhGyjbVQ/vIRg9E7KoqL03OiqBv6YbZV4WvDrrjRbcCknpCyNAw3Ym
-W1HHlAnUBMAoc6SGoiljxRo26IBwHXV3YPfceRFh5jau0bYoYvl+93y+9H7VeiGH
-0amDFlNh2+UCVA8BMZS99pe0nis3cziwQe+cSwyMi7NTzAC9bzqFg6/LoZ7X2xAi
-KBIZHWumDFXXCA2xbFHbDrKicZZQxV+7Y0DlBZTS86HSEQ/0yvbhzcIuWICCtmGn
-bHBhhlmWFwB5/Wq/m9tQpzk+HoGvS45OrtL2DTnUVZb/hwPCrQkJ74rvfU13B5U=
-=3hdY
+iQEcBAEBCAAGBQJQGrEBAAoJEMbwO6tnXQ0sPxMIALEk23ROW7JCuKmbeJLFPCkK
+hoairN8CTTlm70rE+48hXpqqkEm6ojngSdPyciDQCnrDqY+nwbh5hQMcXEzmM0AD
+q0HJwYuH5BmjSPrHNeTl+sr8p2JxYBVW/2NE9eAzJrip+XormuI4MjgXhfdFovdo
+f9lJqFCDITMJDWihG2vmo5YlM95xHMglwJ3dYq5e1AZZxPe6P6NZapkZkBWBn+KL
+6x5IfcZh+9dF7VhGFTcXc+mal+6ofptWpsaUHs07gxtpQbrbAp+XL9Z9rTvK+cbY
+6ylIeqOke97shtYbQj45g2qF7ExwGap/BWDg/NjZS+HZdAyYaj8IMVlkz58l3Cc=
+=Pl7i
 -----END PGP SIGNATURE-----
diff --git a/kde-base/marble/marble-4.8.4.ebuild b/kde-base/marble/marble-4.8.4.ebuild
index ad3a6746fbe8..7475a0fd4189 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.3 2012/07/15 16:37:26 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.8.4.ebuild,v 1.4 2012/08/02 16:55:46 kensington Exp $
 
 EAPI=4
 
@@ -12,15 +12,18 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde plasma python"
+IUSE="debug designer-plugin gps +kde plasma python test"
 
-# tests fail / segfault. Last checked for 4.2.88
-# RESTRICT=test
+# tests fail / segfault. Last checked for 4.9.0
+RESTRICT="test"
 
-DEPEND="
+RDEPEND="
 	x11-libs/qt-core:4
+	x11-libs/qt-declarative:4
 	x11-libs/qt-gui:4[dbus]
 	x11-libs/qt-script:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-svg:4
 	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
@@ -28,10 +31,12 @@ DEPEND="
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
 "
-RDEPEND="${DEPEND}
+DEPEND="
+	${RDEPEND}
+	test? ( x11-libs/qt-test:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bug 414165
+# by default... bugs 414165 & 414165
 
 REQUIRED_USE="
 	plasma? ( kde )
@@ -59,6 +64,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
@@ -70,6 +76,9 @@ src_test() {
 	if use kde; then
 		elog "Marble tests can only be run in the qt-only version"
 	else
+		local mycmakeargs=(
+			-DBUILD_MARBLE_TESTS=ON
+		)
 		kde4-base_src_test
 	fi
 }
diff --git a/kde-base/marble/marble-4.9.0.ebuild b/kde-base/marble/marble-4.9.0.ebuild
index 88acf3d174c4..2139bc49c8fc 100644
--- a/kde-base/marble/marble-4.9.0.ebuild
+++ b/kde-base/marble/marble-4.9.0.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.9.0.ebuild,v 1.1 2012/08/01 22:17:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.9.0.ebuild,v 1.2 2012/08/02 16:55:46 kensington Exp $
 
 EAPI=4
 
@@ -13,15 +13,18 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde plasma python"
+IUSE="debug designer-plugin gps +kde plasma python test"
 
-# tests fail / segfault. Last checked for 4.2.88
-# RESTRICT=test
+# tests fail / segfault. Last checked for 4.9.0
+RESTRICT="test"
 
-DEPEND="
+RDEPEND="
 	x11-libs/qt-core:4
+	x11-libs/qt-declarative:4
 	x11-libs/qt-gui:4[dbus]
 	x11-libs/qt-script:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-svg:4
 	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
@@ -29,10 +32,12 @@ DEPEND="
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
 "
-RDEPEND="${DEPEND}
+DEPEND="
+	${RDEPEND}
+	test? ( x11-libs/qt-test:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bug 414165
+# by default... bugs 414165 & 414165
 
 REQUIRED_USE="
 	plasma? ( kde )
@@ -60,6 +65,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
@@ -71,6 +77,9 @@ src_test() {
 	if use kde; then
 		elog "Marble tests can only be run in the qt-only version"
 	else
+		local mycmakeargs=(
+			-DBUILD_MARBLE_TESTS=ON
+		)
 		kde4-base_src_test
 	fi
 }