Move Qt dependencies to the new category.

Using --force because of bad dependency on gtk+:3 for s390 profiles.

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x17A85C72

5 files changed, 31 insertions, 26 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 642bedd25268..d85cb0c95b97 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.238 2013/02/02 02:56:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.239 2013/03/03 02:03:20 pesa Exp $
+
+  03 Mar 2013; Davide Pesavento <pesa@gentoo.org> avahi-0.6.30-r1.ebuild,
+  avahi-0.6.30-r3.ebuild, avahi-0.6.31.ebuild:
+  Move Qt dependencies to the new category. Using --force because of bad
+  dependency on gtk+:3 for s390 profiles.
 
   02 Feb 2013; Anthony G. Basile <blueness@gentoo.org> avahi-0.6.31.ebuild:
   Add systemd support, bug #366173
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 10a6603b1743..197ad0628cad 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -10,25 +10,25 @@ AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10f
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67
 DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f SHA512 1b0ad0d509fd5e18c651ebe432d4cc85a62cb96e0b240a769ea2f600944eb90d143e4e5abb9057f7bc1a421b4aa743cf483fe8a888b4f63cab61577eda08d7f4 WHIRLPOOL 0c503606adb07741c5ef30b0f8af858cac97e5bf6e36549ed41bb1c76884e27fe234dffe1f8320e7c5570a3cf0032351d6b4c3d2c8905a1be832cb1bdce562e9
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
-EBUILD avahi-0.6.30-r1.ebuild 5552 SHA256 6d25ae9e5e2c8895f68b2ad98dadd5b4afdd8e87c8602eb872bc28adf15d76b7 SHA512 11931043c39d541f827b1d2ff973dbdb39b5d016bfe526037fe5dd4cc7703e2cd2097d3ff80875d1ecd208f2278aeeaf3f87b11df2a244d607ca2420d35f86d4 WHIRLPOOL e230b80c1c66be1172020d71ce763b343998aac4fc0e140f3e151ccfe7497396453c88471f115ff730fa59326ba46e0886230ee368ced1822df91043fb64d168
-EBUILD avahi-0.6.30-r3.ebuild 5937 SHA256 fcea3a3ad227c73b6cb6c1e0c5f6436f25b8674f30edc148dd64289e265609b2 SHA512 6a8581200869d43e7779e2cf5f467355da153f89061157b7d65d8ba9935b9bdc218b8dde26e72b08f6a7a615b8349675893dddb53031a2173a7260b23e38c9f4 WHIRLPOOL 212fcd4126ed8b72833a8e3ee9da9b10f1adefa5daa3ff4a74527955581a5b9c434d45ff2b48535d787f98e827cca72efe88cc4f717c96b699fb25373a015cb1
-EBUILD avahi-0.6.31.ebuild 5968 SHA256 c4e28df122085cf27cca631baf2e4b9ca95623662209903b3878418636ac0bc3 SHA512 b0697c05ade44b1faa2cb79a87e22520cf50520b2cd433da3f9dbabd3c2f06e8b3d26b958f8206c987ee983ac4491ba44afc2750f22e898f0e059da010a0fd3b WHIRLPOOL 245788794da696e700b1789601efddce3688feb8e73cd80aff008cd0e799c3eb411429918b9ae91a59aa91f831edcd5b5550508dba6f364ab45fcda908282334
-MISC ChangeLog 35468 SHA256 4f39d38b51f8e3804868b0bfdb819b03991f2aeec2f580ed57c8326a1090c6db SHA512 9a5bbe89964db5fbabff068e7b7ca7c86a178cecf31fe326ed99cc17224f6d3e3896f801beb02f4ac20102ebacba7283fdb2002ff458b3896f4fc882071084d3 WHIRLPOOL ce1cc59f9c98631871f5c022ee2c67e342cc8c2650fd16de9cb7c5f0d1e6d6d14258ede75a76ee3a0b1073305969d21019293d3d427d2aa337a671ed7e954a68
+EBUILD avahi-0.6.30-r1.ebuild 5546 SHA256 a6eeaf4034611e7e8f9dedca227b46d97ec2af0429abc4953fa25c204c1a9b50 SHA512 a7b6633ef58439f17b4f818e684b904e02b20c96da7561aead8e10642cef7a6dd43d83973903695a50e27aecc61e24cac06db339841945f60462069d54c95e0a WHIRLPOOL 653c0c365a1a2be79207eff6316162117bac1425278035b599d5d26e207a64066aff6cb33f4e92670f864644869fc58070c018e1fe6c17e44940562de699c979
+EBUILD avahi-0.6.30-r3.ebuild 5931 SHA256 c2a49317f0bb636cdc215a0eafa152f3c4c6a5b4cc9c14ea125b59d09891593f SHA512 5467ecfda19a047f992d2a1243867608ed0a6b8f6e25651ad14faece8e184a8a9bc77c3323f9555173a22850b1011233a4107de32378af4138d9e0d187353c22 WHIRLPOOL 737b9e6e0b379ea3b25a8e65ce057195d7f71feb679ad5cfc47261f4984b8441e9adc2770878e04dc59c1586430ee96ab87e22148b22852fe6313e7f4d71deb3
+EBUILD avahi-0.6.31.ebuild 5961 SHA256 f0ea8a9a2aa1678dc9ad7f955fecc2d40fd6537f40e0b4e3849672ce9a8a9dd6 SHA512 6a8d25e56d67a7d6cbb82153b1626ebbac468bcdc6ba3dfaebb9210e31fa43a8b581978039ec7e54cf80639ee68714b1d8c0157cabea6fc544df610102ece886 WHIRLPOOL c1999e54f3a7c5f26dea8d9b18c4a6610f7e355444200d794fcff43abeffeaa5757af16c7083500a53ef4c5045828549714a2169529c023a438cdca6a3e01f4d
+MISC ChangeLog 35701 SHA256 0c07d0639a6aa25d16da00158c1279940cd755220c1cef935077dfaa9d0838f7 SHA512 9fe5701df8d22829b15b923b6c25470aceebe914c7558a8a21740dc791c8eba848765fc6a9a3a6ca303402e12867da6b8b142a13fc3d350506e7544d7c2c612f WHIRLPOOL 01ee44f2c8f681443e4bf3afaa2e35330a8d7ea386138f15e73e5979f9ac362b5c7808b960f86879ee1a5d4b718f423f41a9177696268bcc38fa5d77e74608a6
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRDIB5AAoJEJOE+m71LUu6ABAP/18X/dI29/WxQ25tW1r+uZKk
-m+g5rbqf11U66k4AJ97J72fLc/LQGdTS++F/+a6diDqaO7BDVkf/71KUoz2MeD+t
-KbsecAMAXtN6YGG3bSgW1EeoM+U49o4NZ8t/Rsb6RKINHeNrAHDBRQ1lCIZkkbDu
-eMbUHuh6BbFa6wwdR7pnRQ2Ke/yT4xpUem6qdrDGJkdOgLi0u19CswKw0jkcuMOI
-bJJdkLakXVlYu+QpPaXCL6w60hrMAlqpIKFHULbVY7c03i0NZYEj6lvYp+ZmcbCR
-XOkd0/djglJabOtcZ4r5JbC+Bdyua+/jQ4IhbJdEUs+ibF0KytfeylXpdqHqoJTC
-hB0tx1LDo9qq7r72bQvzvLmW9rjXl2/PWHFnaACDprpvA0VzIBMKDOyeZB+a6UdR
-lWtgC24L+yr9OGZvYBSkf+eOJFgMWHsqAGz9tLsdf6Z3RRR//yW2Sl9EO9xqc9mA
-iBJYGadWWUv9d0TWCC3I+nCvios8pc4eoM/S+X4z0hWh3OT57kEhQri1UxX7sV5V
-M/+1Fp63qz1sRKdyG90L23ZrSjlaULkJk5XGlhFbQWQIvPdiU5PbHNzML9j0OBKl
-Ch0tMAx9pXw7mWqe3Ppi6dmVb/rmpsGxafUKdr+jS9m8kfJkFBPC3Ce2OqWoVOpl
-+l5+WksOggoem3eDPN8F
-=n5iW
+iQIcBAEBCAAGBQJRMq+IAAoJENXLsxwXqFxyYa0QALTg+NTrmhZFIoKqeQX7SDfy
+8clvt5yeqVRBH69oGp86z471lA8oxSO1nAOhWgTjQJ1RyoS8OScFDrQ8+xIsyTa9
+A8c42v0+p4819+ojyPaBYWbrGy09TnR6ClIcImp0F05gdLK4ZJPkzuGmmRHJDVqn
+Uj6T1LpaRnzRYm69aF70kJTPwkhOgJOqI/Mur2zTS6n9IsixS6KZl9eHBR1sMlHt
+7YoE5KHzzDvrK9v4HPBD5F7iBT76d8SDI1yXgXxas2gWetJvZ2//7x/Seu4+WQ/m
+kN65RMRVMIxyyLWZKjIX7UgKTOZoCiMZkB91Z9ygibO4WRHbAg3gzsfsNpfuB5dp
+wTuhxaOrS0lfeQeK7BeNDw4HK6A1f1DTnhY/zrArpe5Wv1Tl7nWcUrL7Art7ckEn
+mVcDRox6MNJqm1RP81cr2XweDEarjmInyhPS3SSEA/J2qXIu0Md6j59QIrnhtPL1
+q4iMH5r5iba53XCBZ7mkjBfhYOvSr7pdA6ghBnGG07AEKDuV7lxQ6rXtXrui+V79
+NdDrHzCz8xLWO5Wi9ToqQB/u194ijMCz4K936klaf2k1nzMt93hebUDJ7Bi/44Ex
+9cPxJhTB0kBAy3oCwf/e599AkgkfkdSDsG5kW1aSFnRTeT9UxTo/O9KpkXhphZ1K
+eS+PqhIkUzAea6EVAKqN
+=l5iV
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.30-r1.ebuild b/net-dns/avahi/avahi-0.6.30-r1.ebuild
index 27ea9ca018b5..64d882fb12e3 100644
--- a/net-dns/avahi/avahi-0.6.30-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r1.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/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.11 2012/06/14 01:55:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.12 2013/03/03 02:03:20 pesa Exp $
 
 EAPI="3"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND=">=dev-libs/libdaemon-0.14
 	dev-libs/expat
 	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
-	qt4? ( x11-libs/qt-core:4 )
+	qt4? ( dev-qt/qtcore:4 )
 	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	dbus? (
diff --git a/net-dns/avahi/avahi-0.6.30-r3.ebuild b/net-dns/avahi/avahi-0.6.30-r3.ebuild
index 05554a7db9f5..3213d0750d0f 100644
--- a/net-dns/avahi/avahi-0.6.30-r3.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r3.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/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.15 2012/10/07 14:33:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.16 2013/03/03 02:03:20 pesa Exp $
 
 EAPI="3"
 
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/libdaemon-0.14
 	dev-libs/expat
 	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
-	qt4? ( x11-libs/qt-core:4 )
+	qt4? ( dev-qt/qtcore:4 )
 	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	dbus? (
diff --git a/net-dns/avahi/avahi-0.6.31.ebuild b/net-dns/avahi/avahi-0.6.31.ebuild
index 4ba6d02f2c56..fee5067bd33d 100644
--- a/net-dns/avahi/avahi-0.6.31.ebuild
+++ b/net-dns/avahi/avahi-0.6.31.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/net-dns/avahi/avahi-0.6.31.ebuild,v 1.2 2013/02/02 02:56:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31.ebuild,v 1.3 2013/03/03 02:03:20 pesa Exp $
 
 EAPI="3"
 
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/libdaemon-0.14
 	dev-libs/expat
 	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
-	qt4? ( x11-libs/qt-core:4 )
+	qt4? ( dev-qt/qtcore:4 )
 	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	dbus? (