Move Qt dependencies to the new category

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 39 insertions, 23 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index d699239f42ee..88ec4f557056 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/merkaartor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.26 2013/01/23 12:08:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.27 2013/03/02 23:21:39 hwoarang Exp $
+
+  02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> merkaartor-0.17.2.ebuild,
+  merkaartor-0.18.1.ebuild, merkaartor-9999.ebuild:
+  Move Qt dependencies to the new category
 
 *merkaartor-0.18.1 (23 Jan 2013)
 
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 971f083cb7ed..05621deaf43f 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0.17.2-includes.patch 452 SHA256 69e257bc8eca02c18313502d4fdf9729e2eaa51e5bd04da8f2115e28d9b675cb SHA512 a920fbd3c7fb54a70ce33e57c188ee1ca775767e78f2d2f5f576a6081c6c351a41276be588d763a2e340ee74cbd30c1b3eb3fcc12f0dc994edc3f43228a739c7 WHIRLPOOL 343abb61b50835ecefd8c0d3212ba30bab971ef0fc9cb63a818a385bc363318729097ee9731e3bf055089c7401f6f33688f4bf6183336eae7743e861697b009b
 AUX 0.17.2-libproxy.patch 483 SHA256 94c6eca2403ac89d9454837e547651d3158f94ab4abb2e1e9a5f586159990513 SHA512 b958d6d463076530c1105b7bddb7b1fabfc59a22a3a552878b79c52f80d4ae1abf2d21af74a854b22ef7d2070632bdddec2836006ceee4c63b41cc29853c0088 WHIRLPOOL 0372d1e5a8595c314a88cd7fb9d292c2a733768eb9d883569595bc67728c8abd0294a2f861639c10eb697edb34e3b4c6d859490c41ea5467050d93dd3013643b
 DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
 DIST merkaartor-0.18.1.tar.bz2 5579080 SHA256 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f SHA512 d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45 WHIRLPOOL 23327a7eaa91531a95665fe9ff647712606babf96e3843ef33b94a37f6f7ca6d1cb09576b0b31197badc32e87cfc7ca275a9e3792e57f57dd58fe0509ec1b46d
-EBUILD merkaartor-0.17.2.ebuild 2051 SHA256 4962244e7905fa770b635dcd30c42e7e5762350560a1feeabdaf53fc911d701e SHA512 15224d4b441b26ffdc9ccad9cf6c29e26b46e8166f9c8303b4a596584d4fc276b987bb0e89ffea596158066a51f4df654973684a4bfa6439e559025c42479b81 WHIRLPOOL b8cf9faa6c980880e187ee138c264d0ce6ae2d156357f8b0ccb19b5da38bbff5183e5ee8c402954f8ce410c202c5ae1938b4961d38bfbd3f07f89a2deebf4d02
-EBUILD merkaartor-0.18.1.ebuild 2057 SHA256 1e4c338dbe21250b7019aa3673b90ba106933e63c1f502f33c1b9deb4eeb5996 SHA512 2aeea7558f92aac73460e81742d842425342a18ab7d649f613a606c62d5f9cd7b175a25a9cf2e3cc2f4b3e3a2b1990a13e14c301d08ad43d328a0fd7d38a3a09 WHIRLPOOL 216b41f89485644eb3a70e4a04d5b2de54b90d6519866fe94a4ea08b3926a8f64f6aa7436df9d99b38a4abe12ea7d84b01af08ff5525fad95d6632c7ffef7c1b
-EBUILD merkaartor-9999.ebuild 1931 SHA256 d89239fef8cdf866334f4573d99263217cc92f8afb6f900e94e2a94e5605b51d SHA512 36107df9434c880b05731148080c82b8b2d0591d58a79bb5c34e1c27bc1583bdc2061dea0f08f5288a3c2f7e9b6defba51ffb1072b6f7c87ba6de8d5c88f59b2 WHIRLPOOL b2b1308266c0c2220cb44ca385dba09edc4b7b7b531c7a037b20862c15aceb2861675450d555af8d13364935eeb7489c9e169264d67a6dac5f28e57d40b6f41a
-MISC ChangeLog 4245 SHA256 72242946100f40740a01f837afaddb915602c357eb05ec0d7094397987ea5c43 SHA512 6183a65165bbcff2fe93eae199a6afcb788998f4e0dcefd60fbb2a3f2882cb79993f83793396e951315b60f5384ec2453db7da56869a2cb55fb2e48e398bb569 WHIRLPOOL fbe5676d76a23072f7cdb87d8b5fcd28e9c957fc1927dfd23b4d9d8e87a32a5393a4c25972e17a665b9074017bd35aff96d00f39169984ad7d41551cff37cb18
+EBUILD merkaartor-0.17.2.ebuild 2047 SHA256 0341c9ec8b5100e9d58e34d9b3466c71535cb4cec13cff6d5c9616741e33cc6c SHA512 926fbaadda785b85e65410443fe76a2ac2aca9e21c757ee929c86bcfa07c426a896c87df171f4abd070782f879930eed0b09f09542e1748ccfc0a3b6300bccd3 WHIRLPOOL 48eb0dd530440f8078a0b7e0eb6e316f01acaa498726d76c7f7d8dce755ab91a72fc0a7e9670494906b6b0cac00f3c49f8b676a0a91435f1a9d050a2aef4ec3f
+EBUILD merkaartor-0.18.1.ebuild 2052 SHA256 20e0813953849f572f244e4a959eaa93d5af6996e11373fe0939704fd43534e7 SHA512 e7809b83e1d58bf7279058638c893e8131c1231317bee25d785d88cad20f20841ff5fca5de9e388c68e8e7df58b924e89deba4db4f55228faa383ebfaaad1be9 WHIRLPOOL a33b943fd8d0de714802139efa2e5e35fe36334738d5a3da5fe05e0a9481759277ddc783b993f0150b52253c149303ef77e4d6796324d6622f4901e58e8cc8a1
+EBUILD merkaartor-9999.ebuild 1921 SHA256 5fb22217f7ad2daca71a6075260c54fa227bf074d0dea4aff11d654782c2bb1d SHA512 3e6b40ce3a9e7de12cc7423edb79bb8d13946d7d83ba544be06fa7bcfca6a210a56ba94b6fbbed114ce3d67a025aa9c919955cf0725e497f4331cae059b10324 WHIRLPOOL 8acff4a69d375832d90209753ebe13dc126ae4d84660ad569c88f3ee1b9edd8ae24d3b73cd4bed520cb2d15e8c38e50b01fcfefc0f510f93942dfd393523789c
+MISC ChangeLog 4424 SHA256 71ae38819a19afa636b4df42c88cffbc4706df57f1b6fa7fa74bb33e62285b14 SHA512 2ed151f4125d3507f7eb1ae89ff5c89bbbca1a7038017b35818b788dafaabafbdaf5b96a00c3b579062b0fffb805c2504e4acbe33edac2acde2774da32039144 WHIRLPOOL 8817912d85a10e1e61a81bbee7307d0d48d2eb04df494f9e750b577c9fac8be90df5366a5418262a7b6d89f8eba9e0efe11a04c5d89b66b57f908cc77def80d9
 MISC metadata.xml 469 SHA256 e96b1cb32ec44fd58b5f27975bfbfb6943a13b7a8fd578f17125a595506cbf27 SHA512 205937536421225aef27926ad2a9c67d8087e24842b8aa7580dfdca20c89a36c96ffa3ecdab499a72617214709ba317e48f09ad1eebe3e40be1083594898e5cc WHIRLPOOL dfb164ea1380a780caa70b32eb274d99783af6a7ab561d0b00d85862c7f57c5f157dd0a3e394a132292938c25b5a9dec59b7420efd7f72b7d19e3a799a5ffa3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlD/0qsACgkQgAnW8HDreRbSawCgjgVZyBxwOD6WfJTyDf0ml7L+
-wL8An0wEcPL5glJHumXfk7tLkbDNa+MC
-=/kX3
+iQJ8BAEBCABmBQJRMomCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88oS8P/jprKgm0u36EszHvTF0ZAv69
+iy1MamlcvUW7gw66LAz+RnNJfAOYLNQmUp6Vkn/AoOrT5WNBKYlMQ/cvkA2VmyFY
+ZJAuZ1jGnZ8YJ5bPq0QUpwKz/IFWvb7MVYTti4b1FIlZptajOOdUUQImkoD4iCur
+snoDXIPi4d9m85B/3jcJdR9BD/+xPHEjiPGFDaB/kIPv68ekXSYFIQN79jxIuH2d
+KZHRzInSIt2/rlV7FJBBZGd2rTJwzq6N2Nn2qqq/MQH5XatFTCVF+26EhFgHK3rw
+hweVBErted8JU3VP+MU2WiU7gfq5fph+A4vYehNSivSRmFoPdErt2gTego4KgjUB
+dIr2vhp4B5StstzIaMNs9KqHo0Yk1uDmiIWemOwWOLxzBzG4Q9pDS48MS4wHkiKQ
+cJhf9LJFjzjCbZP34R0yFoWSrsVQPSev8Lv23nW+KrD4DcZAkTVA0hAGjkAeQV6D
+dLxCOFxdoYU4vtPyaCF++iY99+vyKqKWcNd/EMP4EWI2T36HbysXVskWWxDwRVA/
+a81bDFlrD/8LnETgc1UCLiiH0AtjM2qIG2OwebpbsPd5MHlOOnak29A3vas1r/6M
+ZWKauukkcD1mph17lw3peclKwZ8bzrl4IYoxvLJDoAJwoLTHfmpRlvipC96oNzfN
+rjO/DnjrVWH4GEMipJ76
+=QzoQ
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
index 7584ca3e5aa7..505d2d28c0cb 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.7 2012/11/16 20:13:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.8 2013/03/02 23:21:39 hwoarang Exp $
 
 EAPI=4
 
@@ -28,9 +28,9 @@ DEPEND="
 	>=dev-libs/boost-1.46
 	>=sci-libs/gdal-1.6.0
 	>=sci-libs/proj-4.6
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
-	>=x11-libs/qt-svg-${QT_MINIMAL}:4
-	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
+	>=dev-qt/qtgui-${QT_MINIMAL}:4
+	>=dev-qt/qtsvg-${QT_MINIMAL}:4
+	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
 	exif? ( media-gfx/exiv2 )
 	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
 	libproxy? ( net-libs/libproxy )
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
index 71a4baa3a0a9..973edc7f9c86 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.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/merkaartor/merkaartor-0.18.1.ebuild,v 1.1 2013/01/23 12:08:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild,v 1.2 2013/03/02 23:21:39 hwoarang Exp $
 
 EAPI=4
 
@@ -29,9 +29,9 @@ DEPEND="
 	>=dev-libs/boost-1.46
 	>=sci-libs/gdal-1.6.0
 	>=sci-libs/proj-4.6
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
-	>=x11-libs/qt-svg-${QT_MINIMAL}:4
-	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
+	>=dev-qt/qtgui-${QT_MINIMAL}:4
+	>=dev-qt/qtsvg-${QT_MINIMAL}:4
+	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
 	exif? ( media-gfx/exiv2 )
 	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
 	libproxy? ( net-libs/libproxy )
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index a6e8ea331f21..7a4843061155 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.13 2012/06/16 08:29:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.14 2013/03/02 23:21:39 hwoarang Exp $
 
 EAPI=4
 
@@ -23,12 +23,12 @@ QT_MINIMAL="4.7.2"
 RDEPEND="
 	>=sci-libs/gdal-1.6.0
 	>=sci-libs/proj-4.6
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
-	>=x11-libs/qt-svg-${QT_MINIMAL}:4
+	>=dev-qt/qtgui-${QT_MINIMAL}:4
+	>=dev-qt/qtsvg-${QT_MINIMAL}:4
 	exif? ( media-gfx/exiv2 )
 	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
 	libproxy? ( net-libs/libproxy )
-	webkit? ( >=x11-libs/qt-webkit-${QT_MINIMAL}:4 )
+	webkit? ( >=dev-qt/qtwebkit-${QT_MINIMAL}:4 )
 "
 DEPEND="${DEPEND}
 	>=dev-libs/boost-1.46