Properly fix qtgui/qtdbus deps wrt bug 484190.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

6 files changed, 43 insertions, 14 deletions

diff --git a/sci-geosciences/qlandkartegt/ChangeLog b/sci-geosciences/qlandkartegt/ChangeLog
index 28ba05c4a418..f0944e836c66 100644
--- a/sci-geosciences/qlandkartegt/ChangeLog
+++ b/sci-geosciences/qlandkartegt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/qlandkartegt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.21 2013/07/10 05:02:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/ChangeLog,v 1.22 2013/10/01 21:41:23 pesa Exp $
+
+  01 Oct 2013; Davide Pesavento <pesa@gentoo.org> qlandkartegt-1.4.2.ebuild,
+  qlandkartegt-1.5.1.ebuild, qlandkartegt-1.6.0.ebuild,
+  qlandkartegt-1.7.0.ebuild:
+  Properly fix qtgui/qtdbus deps wrt bug 484190.
 
   10 Jul 2013; Patrick Lauer <patrick@gentoo.org> qlandkartegt-1.4.2.ebuild,
   qlandkartegt-1.5.1.ebuild, qlandkartegt-1.6.0.ebuild,
diff --git a/sci-geosciences/qlandkartegt/Manifest b/sci-geosciences/qlandkartegt/Manifest
index 5cdaad7410dc..f489ff945f0d 100644
--- a/sci-geosciences/qlandkartegt/Manifest
+++ b/sci-geosciences/qlandkartegt/Manifest
@@ -1,10 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST qlandkartegt-1.4.2.tar.gz 6347471 SHA256 89f1021bda2bba054cb6d4363bb04fd5002fc34ccd01c73aa2513e99cfd65535 SHA512 86756f1bf81a65da0c74c5dfb60c20abdd6e905b2b75c725c1e8aa63d2d9de9aad73a90b2ffcde473685a4b4b44de92f9cd6e8d4be854ff3aa55687abcde7626 WHIRLPOOL c66a7a5f13be97656a1d6644c8acb49a79e6504a6d4f8c20de0d23d6987cea5755a7184d196663abb67f535c45e0f32e1fda03013cbb366e62141971e2ed0f64
 DIST qlandkartegt-1.5.1.tar.gz 7113881 SHA256 095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd SHA512 28078f5c36dad271b49d377eea26ac1fd45a75b7376c4e73310114c153d1512ec47f5457293f00e7cf9263350380e92261e786735bb0b2fede0416cf3ca5a13a WHIRLPOOL ecc9025aa0936187766d02b1023aad2d4d9d2f51b62126ba39e2029686eb659d676938eebb1ede1f97493498957e08938d1cdb2d75ae2443f1fa24c7cbb7d4d7
 DIST qlandkartegt-1.6.0.tar.gz 7221049 SHA256 995a55cf45acba67aa0144b64782566187c3ed3240652f22d4002127f6f2fcb4 SHA512 c4736f9ca21d7002184c563a488f8c1ae194ab6f73675d3f7c947baeda82c6b655aeadd8402f05ac792f9986879b7b73f49fffa0a3c15b76bb90c6d6b6af0ee2 WHIRLPOOL f17cb0828d2eb99f9a50370acc77bc63ff2d31b60c4e4d954f75807db05c8bae74042186e6164807c2c75beaf3c55779995a15126a7385fdeff0c253a844dafe
 DIST qlandkartegt-1.7.0.tar.gz 8136806 SHA256 4dbab9ed00824647a9afd315619e7974e176a3b47e50f3754441e69f1dbee72d SHA512 c5e5aabb0c44558ce639b3e70df045011c3b2080bddfa2c0685a3b6d171e9e4cc44abd4804f9e0a7f2d62ea6e6a997b8d041374f23eeb2b43accc6b9d4d48802 WHIRLPOOL 27003f9d87efb555567f1f53af1e930107d6c90c6aeaafc684cfed485cd294cbf9b0f401b95c62b6fd4304fab0209b2bc505a7e5cede37fff78f10ebc3ca84b6
-EBUILD qlandkartegt-1.4.2.ebuild 1331 SHA256 15b66f7efb4145904a84bfea41d83e2dbb15c4167de58bc38d1d02fdb4fb571c SHA512 cfe93af38d7c1bcb220112a517993564a02816840338c31c2898b2f94f7e2db3d5f34841478cc3f50cb4267e5147c5467942fc7be127dcf960b5727bb54d8220 WHIRLPOOL a479041072f0b651009d18bf584b2b0121f57e6ca4300eff5b37c4c6652c27e27650c301d664ee1617d37f5ecc77806dbbd888c14b4085c890902b376a94056f
-EBUILD qlandkartegt-1.5.1.ebuild 1458 SHA256 58a081ff02fd3722381f31cb9f556e9303e4ac1746acd4371548888394e24a52 SHA512 47f01d8caea15f70a46c09efa8dc72ad114e924b3550a3f7beb3daede35fed13caa7bb28863d9b1673aa09cb2d04002408bc4faca013bf540e8c240a35a5e101 WHIRLPOOL b38ca5d965aa973889228dfe147daccbe8317ec42637233ad4903a1201ed166b4306d691036c66f8927efe774b086773b56fec1fe8d2a62a4261174e7b523328
-EBUILD qlandkartegt-1.6.0.ebuild 1376 SHA256 445887fe635e8340055b92b689a2aaf1fba52b603c8257cc83e5f9c0c2037453 SHA512 b34422562724cbe18843b66f060cbc8957327a4429f3d48687dc242584605bb4a834bc3a2f6e688ab541db716c62965ba15ed38785a76bd4b13c5468b9c17810 WHIRLPOOL 97ccebc6b967033fc9985d21c6d2bef3cbfdb1c57d137720332115fdf1e8c7e903d71897ce12815c812ed11a53b06836ba0427afa50f77ece74276cb29635f4f
-EBUILD qlandkartegt-1.7.0.ebuild 1382 SHA256 13b8b4dff8c39ab8a7cc7737cb61509cd66c042d0b719f69cbc62176e5f1896a SHA512 095aa735e53220c0f02e929e23d007b5f1e59b8692ae3e55c1d2585a5dd9b4fa8f3667377fdb12a38fbaa55b56171ff1c118993396e69c238f640841ae8e94fc WHIRLPOOL 0efeeddb0e79e9449edc738c4a538351c83ca650cc84509e6bc21bd2dfbcf373b09816335215befededb85241417efbb2fb188f9a1e55b2ac5b33f8fea541675
-MISC ChangeLog 3795 SHA256 ddd5125c8901b2ae3b1339f545439a05f97feaf1b6befed00407b1988ab8044d SHA512 2c6f701c87674cb8b5e92255e34c625e22863bd21ae59c69b3f2aea9444a5559191763311a18c0c34ebfa07ecd3bc4043c33506911776d2cc3c126f3d096dce0 WHIRLPOOL c710a8cf9dc94b1a6f2c4027d2e9c1036ae92f5817695d6b1486971140c988bed02fe756b1a1ddf6057bcaa2aef9508bf99c40bd0ab405cc07eb3ef7048f8354
+EBUILD qlandkartegt-1.4.2.ebuild 1345 SHA256 f3ffef7bc7f444cea590f38cc62a069f9036e2db2f7e2944659d761985b32d0f SHA512 bc876de6845d8c076c8eaedb645b0e03cded3c63eef814a7f899cea75fb41524d4ddbc3019c113bf6013aa4143988d1fbf864f88cefe4f0a994a419dd3918249 WHIRLPOOL a57adf8e11acd43c6e5a0273be8c5be642c917eda43776cfcf9dac4ed64cb7cc2da416087dc57fc482ae916ed320aa6daa03fa231b39d235422a90d7ea65e3cd
+EBUILD qlandkartegt-1.5.1.ebuild 1472 SHA256 aee0e981c11585444a681b18951c5d1ed519bdc2b68e26f0cce69e571f59e4a9 SHA512 dd771427f8c842c221ff28f78c29187be4bdefc89ad7bf1d008953d0b946d6f6ebdb7dde479d49cfaa04a24f5f1f762bd1e657ef185b85f51c9a4537ed29c9e4 WHIRLPOOL 87e2184dcd4d7ce57a40482ae74a89c7c25bcfb36ba60f537b759e9dca0cacda59ddf691f0a9b541b75e48ad0cecd9fc1738a2a33cca80f52bbe28725bab9557
+EBUILD qlandkartegt-1.6.0.ebuild 1390 SHA256 82dc005263d556683867b30c22cc199eb819faae7755d677727f1f1c3c2db74c SHA512 9eb22f4c2c1b782875e6c1313cda3aebcfec57639be6d028afc36d565ddee0370dec56575c77ba5ba5b68bc753f14f40202e3567526def27ab3df7a45c027ddd WHIRLPOOL d674b6b0f4f61a1e0b6346b1fec8f1918d4122a822092168f37cd1d675d5e71265e72b5969c8d5b9011f6f71fe50377c3f0ad940b9d871346efef8b1138a1472
+EBUILD qlandkartegt-1.7.0.ebuild 1396 SHA256 d36f5a3f95136031c0ba9ea49b53897202e6c9573f1bcfc36eb669bcda511c6a SHA512 44f4384b88e734115a31fc1f7f415cfe90b392e0f8bac2e098f00250a82772a2c78fe7b25b34e13c77e0f56ebbe0dbe4fd4bc6a03ee5b2d8c6604edc178b057c WHIRLPOOL f95941bb7d01e80f1e4a261b509f29bf8d5711d24c31124c0a318f5e4c865148a29f7c8869034ad9cd8e7440996d40f5abf1640c0989fabf7e2aedfd0f7496f6
+MISC ChangeLog 4004 SHA256 176fde06658a2b21d031c14f77d30cdf5e0e0c485ca7a50e61c8a5b083ceea22 SHA512 8ef4de8eafc3ef25ef614ec9cacae7aab3e6119d583f955686a8bc6cf751462cd0c70455f0364693abb68ec125c1d710927f63004c9eb9e324000552848f1dbe WHIRLPOOL e5fb96237d18441d63b6ccf18e76116210ae8f5cd6179df1f0330434f4873bcf2aed85bc776674cf7532a41199af890113be2f84aa204b5ea210f2794941ea2d
 MISC metadata.xml 650 SHA256 32e06f8adac515f4d51014365d192a89e87c798838c1d38fd2836c45570b32a0 SHA512 829cb34a8975515e435c51984f8f8a203e070a7f05c6af56cab8b49e1ed61f2828c0596fb6d62d114c9100d97a973ce2997f220a5f35556dd9e6baf42ebee32c WHIRLPOOL a6cd727b96938d0a8a7daaa9bb80929fcd374d75dc0fc4ec301c4cbe1aae350a4287562ca1710fe17b2b574136fbb644b8a33f4a918ec02a9fc83ee785ed9234
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSS0GGAAoJENXLsxwXqFxyGI8P/2Lw+gkJ1mXDv5TT6IE9Wiks
+Zg2x4goGZu67oMn43uBfNguGHw078+7tYXtAV4kv1jtCflg0mV9ZhkNiqhFyofjy
+gtwlWTCBWHq9YKTPQ8KsazCBkuzErefH0ctVhRKMjY9i5VbYzYrALOJWgGk/Kh1+
+4xGYZ4geDNcRdLNhvn1EFATCyeRpcjUecW5MTiPYShLeDt8oV/ED6U73C7xQ8frC
+89HwgFKxQ3cd1FajrhZ3EcgEAXJ5rQdFB+3Z3afkj2Pv7yArY0CldYi0AzkVmU75
+hrBhIZmTucjp3axxHtOw66JgWGtxGDDqX7NDBmIGFmDQrfMxYsqQ1X+Lyc3IM47+
+wtsnbhejAHflR6ij4/7omDzl6RfA8Nq+zUhSx0hWC8w3I3reRxZdbq17JOOkL7BL
+VSyczqjg8NiYFzmUZqphRjzmrGtXSlshfEoQ6RlSyjy7FTV0WgXzo9u2M0fukNt+
+PoBWiSejzJ6gOS6/5Ei+i4NbUhxtqWworBPmmIrvj34cCKAFeLEphlz4Gi6A4KSr
+yXJLAnhbj1nBjoQhjeA1yYA20srC/7YZfCzUQgxlIcdplnetzKY/xx+dAb8lPjzz
+yEi+M0tUGLqdwGluyVrJJjcq+nBTFrfzc3HrU7fTEMdxskbWPc+Mn7QNlJb/HLO5
+1mS7kXAP8kIW3nZE3t6e
+=R3Ro
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild
index cca41f9acdda..61342721addb 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.4.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/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild,v 1.4 2013/07/10 05:02:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.4.2.ebuild,v 1.5 2013/10/01 21:41:23 pesa Exp $
 
 EAPI=4
 
@@ -19,10 +19,11 @@ RDEPEND="
 	>=sci-libs/gdal-1.8
 	>=sci-libs/proj-4.7
 	sys-libs/zlib
-	dev-qt/qtgui:4[dbus(+)?]
+	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4[sqlite]
 	dev-qt/qtwebkit:4
+	dbus? ( dev-qt/qtdbus:4 )
 	dmtx? ( media-libs/libdmtx )
 	exif? ( media-libs/libexif )
 	gps? ( >=sci-geosciences/gpsd-2.90 )
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild
index 9c9faea78543..5d667ccaaf6c 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.5.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-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild,v 1.3 2013/07/10 05:02:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.5.1.ebuild,v 1.4 2013/10/01 21:41:23 pesa Exp $
 
 EAPI=4
 
@@ -19,10 +19,11 @@ RDEPEND="
 	>=sci-libs/gdal-1.8
 	>=sci-libs/proj-4.7
 	sys-libs/zlib
-	dev-qt/qtgui:4[dbus(+)?]
+	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4[sqlite]
 	dev-qt/qtwebkit:4
+	dbus? ( dev-qt/qtdbus:4 )
 	dmtx? ( media-libs/libdmtx )
 	exif? ( media-libs/libexif )
 	gps? ( >=sci-geosciences/gpsd-2.90 )
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild
index ee00edb21428..cf1e9e618fb5 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.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/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild,v 1.3 2013/07/10 05:02:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.6.0.ebuild,v 1.4 2013/10/01 21:41:23 pesa Exp $
 
 EAPI=4
 
@@ -19,10 +19,11 @@ RDEPEND="
 	>=sci-libs/gdal-1.8
 	>=sci-libs/proj-4.7
 	sys-libs/zlib
-	dev-qt/qtgui:4[dbus(+)?]
+	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4[sqlite]
 	dev-qt/qtwebkit:4
+	dbus? ( dev-qt/qtdbus:4 )
 	dmtx? ( media-libs/libdmtx )
 	exif? ( media-libs/libexif )
 	gps? ( >=sci-geosciences/gpsd-2.90 )
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild
index 2dc209c16f17..fe76eb55f7ec 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.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-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild,v 1.2 2013/07/10 05:02:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.7.0.ebuild,v 1.3 2013/10/01 21:41:23 pesa Exp $
 
 EAPI=5
 
@@ -19,10 +19,11 @@ RDEPEND="
 	>=sci-libs/gdal-1.8
 	>=sci-libs/proj-4.7
 	sys-libs/zlib
-	dev-qt/qtgui:4[dbus(+)?]
+	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4[sqlite]
 	dev-qt/qtwebkit:4
+	dbus? ( dev-qt/qtdbus:4 )
 	dmtx? ( media-libs/libdmtx )
 	exif? ( media-libs/libexif )
 	gps? ( >=sci-geosciences/gpsd-2.90 )