Synchronized from official portage tree.

There have been some improvements to some of the packages since the
kde-sunset overlay was created.  Here I try to include these impruvements
into the overlay, as long as they affect packages related to KDE 3.

4 files changed, 12 insertions, 28 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 0a4d480f..5f2fddf0 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.169 2009/08/13 18:19:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.170 2009/10/06 17:19:57 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> avahi-0.6.24-r2.ebuild,
+  avahi-0.6.25.ebuild:
+  Removed alternative dependency on Qt metapackage
 
   13 Aug 2009; Sven Wegener <swegener@gentoo.org> avahi-0.6.24-r2.ebuild,
   avahi-0.6.25.ebuild:
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index d472c19c..f94aba26 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.24-CVE-2009-0758.patch 953 RMD160 7c1a2a2082c61d6feb05d985068122133b434b02 SHA1 429347d8b9f9022c5316ce1e5163a68fa7393b4f SHA256 e8a93a705ec07ca6a4c4c7634a97b9b2c5ee0712c9e80767c6bf7e3f4a5d6853
@@ -8,14 +5,7 @@ AUX avahi-0.6.24-cmsg_space.patch 449 RMD160 9593ee893daf908e35f36a7396ae5d52a76
 AUX avahi-0.6.24-libintl.patch 542 RMD160 918aa11cdbce6f38d9a9446c798db2bc43a957b5 SHA1 c9f8ef5d0047b591e6e88153731ae380d64a2431 SHA256 fb8e37d6071a990184a7ad3c20a7709554103fb2c4f02450c338b9fbcf358215
 DIST avahi-0.6.24.tar.gz 1115626 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
 DIST avahi-0.6.25.tar.gz 1103653 RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
-EBUILD avahi-0.6.24-r2.ebuild 5320 RMD160 1159e217c8e6eaf40b443522010135dc0c3345f3 SHA1 520b5ff7956d2a9233b3c56b73212bf1ddab9506 SHA256 75bdc07645f5ec8453219940216f325d7be2b8e040a1b505981a217aa2fecf42
-EBUILD avahi-0.6.25.ebuild 5272 RMD160 b85b5df8ba1e37776b3f277ba1d90d24cc85eba3 SHA1 afacd0e3a2ac73d56fc1d73b8978963586430bd4 SHA256 fe3b6c7233c85da5d68799348c8ece0f664a2162cff334a853b548cb14439084
-MISC ChangeLog 25286 RMD160 8b72eb3548aa16579887ce08fac734a7a38abb67 SHA1 4a9f3cf731d320858473b74f96d114ca405af036 SHA256 ae8cd8acbf30bcc32dd65bfa085e307b23c11f257ac280f4e95392515c30da59
+EBUILD avahi-0.6.24-r2.ebuild 5284 RMD160 c995a0dff6ccdee03beeac1c5d1af93c7605541e SHA1 edee2c91918ce8536244b3abca7c33be354fa18f SHA256 f30ed1db9356190806974520bd40f22926f4d574c92aba611fc09853afb42fac
+EBUILD avahi-0.6.25.ebuild 5236 RMD160 59dd46c002eae157cd056f7b570e349deef8c3a1 SHA1 3817d296b4189f69268a9e386b3c666323f0d788 SHA256 88b99009547c5de5ab6763809f30c902e9478f318017d7a3b2d2b9ca4b48820b
+MISC ChangeLog 25430 RMD160 fd16b2a1b50ce4d5245397c6b618a64bb03610a6 SHA1 7e3d0337035a4800bbbc59750e080811a35a4891 SHA256 166bf1e046f74ff286fd191a8b703260634b48a2ffe5542ddee0768a5a4db35c
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqEWTYACgkQI1lqEGTUzySUwACfeAsWXDmvtAoM3kTluElNN2ob
-hGEAn1pv+kPQOmVFgiNgKaAAUI1tQ4zL
-=ae53
------END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
index f8d2a338..3e2708fd 100644
--- a/net-dns/avahi/avahi-0.6.24-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.24-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.10 2009/08/13 18:19:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.11 2009/10/06 17:19:57 ayoy Exp $
 
 EAPI="1"
 
@@ -20,12 +20,7 @@ RDEPEND=">=dev-libs/libdaemon-0.11-r1
 	>=dev-libs/glib-2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( x11-libs/qt:3 )
-	qt4? (
-		|| (
-			x11-libs/qt-core:4
-			x11-libs/qt:4
-		)
-	)
+	qt4? ( x11-libs/qt-core:4 )
 	gtk? (
 		>=x11-libs/gtk+-2.4.0
 		>=gnome-base/libglade-2.4.0
diff --git a/net-dns/avahi/avahi-0.6.25.ebuild b/net-dns/avahi/avahi-0.6.25.ebuild
index ef859700..e1153f66 100644
--- a/net-dns/avahi/avahi-0.6.25.ebuild
+++ b/net-dns/avahi/avahi-0.6.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.2 2009/08/13 18:19:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.3 2009/10/06 17:19:57 ayoy Exp $
 
 EAPI="1"
 
@@ -20,12 +20,7 @@ RDEPEND=">=dev-libs/libdaemon-0.11-r1
 	>=dev-libs/glib-2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( x11-libs/qt:3 )
-	qt4? (
-		|| (
-			x11-libs/qt-core:4
-			x11-libs/qt:4
-		)
-	)
+	qt4? ( x11-libs/qt-core:4 )
 	gtk? (
 		>=x11-libs/gtk+-2.4.0
 		>=gnome-base/libglade-2.4.0