Fix the qt4 dependency, thanks to Guillaume Infantes in bug #148520.

Package-Manager: portage-2.1.2_pre1-r1

6 files changed, 36 insertions, 32 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 240aeeb0ce15..36db8d8c1dc0 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.61 2006/09/21 22:50:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.62 2006/09/24 19:12:39 swegener Exp $
+
+  24 Sep 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.11.ebuild,
+  avahi-0.6.12.ebuild, avahi-0.6.13.ebuild, avahi-0.6.14.ebuild:
+  Fix the qt4 dependency, thanks to Guillaume Infantes in bug #148520.
 
   21 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> avahi-0.6.14.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 60500e53a836..c972007ef422 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -22,26 +22,26 @@ EBUILD avahi-0.6.10.ebuild 3197 RMD160 20c62f409d9a6f51a925d8d030aae2a2e778937a
 MD5 6a94ea924fd350d53336c2be63109890 avahi-0.6.10.ebuild 3197
 RMD160 20c62f409d9a6f51a925d8d030aae2a2e778937a avahi-0.6.10.ebuild 3197
 SHA256 02822eef91e2d8c012b9d456836e1e45ac0bc78be0cf11321ea01b96e21862f0 avahi-0.6.10.ebuild 3197
-EBUILD avahi-0.6.11.ebuild 3414 RMD160 dc2fb687768f286b61cad7217f4072e2c8fb69c0 SHA1 d23c43b050ad83c1489e73b28d688c250e81b16f SHA256 75cfac554558ee8a08a63f3636b2df0312c441faf5d719943b71543658b0b055
-MD5 9df09ab4ab16c2957d286fe5b7c83e74 avahi-0.6.11.ebuild 3414
-RMD160 dc2fb687768f286b61cad7217f4072e2c8fb69c0 avahi-0.6.11.ebuild 3414
-SHA256 75cfac554558ee8a08a63f3636b2df0312c441faf5d719943b71543658b0b055 avahi-0.6.11.ebuild 3414
-EBUILD avahi-0.6.12.ebuild 3458 RMD160 8d371853592aefd9441487f077796870a24b9759 SHA1 4b4c167affc0c05fd57a7279b0d20f56dd289157 SHA256 ac3b5309bbcba8b69b04b1fb52a9d86f3c051aa0e3224d03c36985e1be79c500
-MD5 0a6e9c7516f73783c8b2e5fd04454261 avahi-0.6.12.ebuild 3458
-RMD160 8d371853592aefd9441487f077796870a24b9759 avahi-0.6.12.ebuild 3458
-SHA256 ac3b5309bbcba8b69b04b1fb52a9d86f3c051aa0e3224d03c36985e1be79c500 avahi-0.6.12.ebuild 3458
-EBUILD avahi-0.6.13.ebuild 3464 RMD160 b31c5a671e70ed52099091d407243bf9d6424c80 SHA1 661d2d677e30f5fc0e8214c7fe6d3388167cb910 SHA256 98411ddbfb3f95019c0f5872291e0a30ab0d54b60be999a84b0e0232013c3b34
-MD5 411d2fc0a5ddd7fe3761f1b8074b8781 avahi-0.6.13.ebuild 3464
-RMD160 b31c5a671e70ed52099091d407243bf9d6424c80 avahi-0.6.13.ebuild 3464
-SHA256 98411ddbfb3f95019c0f5872291e0a30ab0d54b60be999a84b0e0232013c3b34 avahi-0.6.13.ebuild 3464
-EBUILD avahi-0.6.14.ebuild 4058 RMD160 9e83247e9dbecb05a4f3384848a917d6e78418b8 SHA1 4c520c8e92a95b60fcaf2e8ef2f26ea083677579 SHA256 cabf52ad43d7e29d17b00f087e67950bfe8f27c8bfdf87f006a0f30d66cb36e7
-MD5 3997af33ce86c236559356f3a404885e avahi-0.6.14.ebuild 4058
-RMD160 9e83247e9dbecb05a4f3384848a917d6e78418b8 avahi-0.6.14.ebuild 4058
-SHA256 cabf52ad43d7e29d17b00f087e67950bfe8f27c8bfdf87f006a0f30d66cb36e7 avahi-0.6.14.ebuild 4058
-MISC ChangeLog 8242 RMD160 4764b0ee4a12ae03b68c33738d2c6ca308ffd7c7 SHA1 4f050311aabbe976af05af6aae41b1a9dc66a460 SHA256 589664c9aae4646d6ef946c3516da7de482db9b479ff10f2ae81bf2bfca8d6a8
-MD5 2709b46a5a6e046a382a9211b6a60ff5 ChangeLog 8242
-RMD160 4764b0ee4a12ae03b68c33738d2c6ca308ffd7c7 ChangeLog 8242
-SHA256 589664c9aae4646d6ef946c3516da7de482db9b479ff10f2ae81bf2bfca8d6a8 ChangeLog 8242
+EBUILD avahi-0.6.11.ebuild 3415 RMD160 24570653799fa485686933937172b23161a8088e SHA1 9c179ea2f799951c73910ab3b282e96ead5c4251 SHA256 5eb4673b32c975d78cfd5eb10236e3b4bfb30049d117d7e8c77a1c8753dbe2c9
+MD5 061ed0016d5683bb2b10095917ec2a9e avahi-0.6.11.ebuild 3415
+RMD160 24570653799fa485686933937172b23161a8088e avahi-0.6.11.ebuild 3415
+SHA256 5eb4673b32c975d78cfd5eb10236e3b4bfb30049d117d7e8c77a1c8753dbe2c9 avahi-0.6.11.ebuild 3415
+EBUILD avahi-0.6.12.ebuild 3459 RMD160 bc1e1d639e7531e7f15024abb6a068615573383d SHA1 e636d3c87c1c30fa3acacab19d16d539c42230ea SHA256 4529d380593a7d3f27728f9e73ed5f61c0f184c255cef9e3b62574b6cca1257f
+MD5 362af9bbbc7dbd4661711b8e1548d5c4 avahi-0.6.12.ebuild 3459
+RMD160 bc1e1d639e7531e7f15024abb6a068615573383d avahi-0.6.12.ebuild 3459
+SHA256 4529d380593a7d3f27728f9e73ed5f61c0f184c255cef9e3b62574b6cca1257f avahi-0.6.12.ebuild 3459
+EBUILD avahi-0.6.13.ebuild 3465 RMD160 ac874df382cc9437461e47833e73dfe25416c04a SHA1 d657dd9e1ecd7a94b0ab2aa620903bd8c6572fc5 SHA256 454bb38006a91df2c5d1a626c086ee1176b6f32d929568162c30e750abe553ce
+MD5 5cd8b49634f83ffd72d9b0f4d3b381cf avahi-0.6.13.ebuild 3465
+RMD160 ac874df382cc9437461e47833e73dfe25416c04a avahi-0.6.13.ebuild 3465
+SHA256 454bb38006a91df2c5d1a626c086ee1176b6f32d929568162c30e750abe553ce avahi-0.6.13.ebuild 3465
+EBUILD avahi-0.6.14.ebuild 4058 RMD160 a1770fd67c4015b9a452e2055484b23bd72e5415 SHA1 2df22f27147f0203641ac270bb1000d3c0d878cc SHA256 91426ced6a484126ded9a01926bb5caca62e9b35943283a71daee40c61ebcba6
+MD5 4330a83d4c06318713869804551b778f avahi-0.6.14.ebuild 4058
+RMD160 a1770fd67c4015b9a452e2055484b23bd72e5415 avahi-0.6.14.ebuild 4058
+SHA256 91426ced6a484126ded9a01926bb5caca62e9b35943283a71daee40c61ebcba6 avahi-0.6.14.ebuild 4058
+MISC ChangeLog 8449 RMD160 797dedc0cc6465da2f32cb04d2e3bc4eaefcc97a SHA1 b05241caaaeb879f9db2b70ec98e12aca3f64a4d SHA256 b960b0d44d79216c54f371dbbc261b9600b65fd61c9e3c8e0b570540830bd1df
+MD5 dc473a45c2797309ce4c16f5ceccb131 ChangeLog 8449
+RMD160 797dedc0cc6465da2f32cb04d2e3bc4eaefcc97a ChangeLog 8449
+SHA256 b960b0d44d79216c54f371dbbc261b9600b65fd61c9e3c8e0b570540830bd1df ChangeLog 8449
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -64,7 +64,7 @@ SHA256 2213392942ab441f53bc099209d6404d32d2e807d82ca96c2c3a92a0fd4a1d3c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFExdAAiZjviIA2XgRAkqgAKC8sGVdy/r9pyMgjYlddZoElmpQQQCfSdT1
-6oogQ25YWKuL/hxiPFNpbWQ=
-=0Or9
+iD8DBQFFFthgI1lqEGTUzyQRApK4AKCa38FazOvjRTF+s6+9+YBJwUd+rwCgmJrW
+IPz/N3RX833kJrZ+5Rg4fFU=
+=1TrR
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.11.ebuild b/net-dns/avahi/avahi-0.6.11.ebuild
index 0ca4a0fc0a82..0fda76a92892 100644
--- a/net-dns/avahi/avahi-0.6.11.ebuild
+++ b/net-dns/avahi/avahi-0.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.11.ebuild,v 1.3 2006/09/20 19:04:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.11.ebuild,v 1.4 2006/09/24 19:12:39 swegener Exp $
 
 inherit eutils qt3 qt4 mono python
 
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 	>=dev-libs/glib-2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( $(qt_min_version 3.3.6-r2) )
-	qt4? ( $(qt_min_version 4) )
+	qt4? ( $(qt4_min_version 4) )
 	gtk? (
 		>=x11-libs/gtk+-2
 		>=gnome-base/libglade-2
diff --git a/net-dns/avahi/avahi-0.6.12.ebuild b/net-dns/avahi/avahi-0.6.12.ebuild
index f9ec2b5da14c..57fd5f0b10f7 100644
--- a/net-dns/avahi/avahi-0.6.12.ebuild
+++ b/net-dns/avahi/avahi-0.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.12.ebuild,v 1.5 2006/09/20 19:04:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.12.ebuild,v 1.6 2006/09/24 19:12:39 swegener Exp $
 
 inherit eutils qt3 qt4 mono python
 
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 	>=dev-libs/glib-2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( $(qt_min_version 3.3) )
-	qt4? ( $(qt_min_version 4) )
+	qt4? ( $(qt4_min_version 4) )
 	gtk? (
 		>=x11-libs/gtk+-2
 		>=gnome-base/libglade-2
diff --git a/net-dns/avahi/avahi-0.6.13.ebuild b/net-dns/avahi/avahi-0.6.13.ebuild
index 503d88031d72..d7b9ab939f3a 100644
--- a/net-dns/avahi/avahi-0.6.13.ebuild
+++ b/net-dns/avahi/avahi-0.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.13.ebuild,v 1.3 2006/09/20 19:04:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.13.ebuild,v 1.4 2006/09/24 19:12:39 swegener Exp $
 
 inherit eutils qt3 qt4 mono python
 
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 	>=dev-libs/glib-2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( $(qt_min_version 3.3.6-r2) )
-	qt4? ( $(qt_min_version 4) )
+	qt4? ( $(qt4_min_version 4) )
 	gtk? (
 		>=x11-libs/gtk+-2
 		>=gnome-base/libglade-2
diff --git a/net-dns/avahi/avahi-0.6.14.ebuild b/net-dns/avahi/avahi-0.6.14.ebuild
index 1f34aafa6a10..9023642e3b38 100644
--- a/net-dns/avahi/avahi-0.6.14.ebuild
+++ b/net-dns/avahi/avahi-0.6.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.14.ebuild,v 1.2 2006/09/21 22:50:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.14.ebuild,v 1.3 2006/09/24 19:12:39 swegener Exp $
 
 inherit eutils mono python qt3 qt4
 
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 	>=dev-libs/glib-2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( $(qt_min_version 3.3.6-r2) )
-	qt4? ( $(qt_min_version 4) )
+	qt4? ( $(qt4_min_version 4) )
 	gtk? (
 		>=x11-libs/gtk+-2
 		>=gnome-base/libglade-2