--- /usr/portage/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild	2006-05-26 13:35:58.000000000 -0600
+++ kdelibs-3.5.2-r6.ebuild	2006-05-27 22:19:56.000000000 -0600
@@ -13,7 +13,7 @@
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff zeroconf"
+IUSE="acl alsa arts avahi cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff zeroconf"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
@@ -40,7 +40,7 @@
 	openexr? ( >=media-libs/openexr-1.2 )
 	spell? ( || (  ( app-text/aspell app-dicts/aspell-en )
 	              app-text/ispell ) )
-	zeroconf? ( net-misc/mDNSResponder )
+	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
 	virtual/fam
 	virtual/ghostscript"
 
@@ -52,6 +52,8 @@
 RDEPEND="${RDEPEND}
 	|| ( x11-apps/rgb virtual/x11 )"
 
+PDEPEND="avahi? ( kde-base/kdnssd-avahi )"
+
 PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
 	${FILESDIR}/${PN}-3.5.0-kicker-crash.patch
 	${FILESDIR}/${P}-xorg7-rgbtxt.patch
@@ -99,8 +101,13 @@
 	        $(use_with alsa) $(use_with arts)
 	        $(use_with kerberos gssapi) $(use_with tiff)
 	        $(use_with jpeg2k jasper) $(use_with openexr)
-	        $(use_enable cups) $(use_enable zeroconf dnssd)
-	        --without-hspell"
+	        $(use_enable cups) --without-hspell"
+
+	if use zeroconf && ! use avahi; then
+		myconf="${myconf} --enable-dnssd"
+	else
+		myconf="${myconf} --disable-dnssd"
+	fi
 
 	if use spell && has_version app-text/aspell; then
 		myconf="${myconf} --with-aspell"