--- /usr/portage/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild	2007-11-03 17:11:19.000000000 +0100
+++ kdelibs-3.5.8-r1.ebuild	2007-11-11 10:13:50.000000000 +0100
@@ -14,7 +14,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 branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
 avahi kernel_linux fam lua kdehiddenvisibility"
 
 # Added aspell-en as dependency to work around bug 131512.
@@ -37,7 +37,7 @@
 	kerberos? ( virtual/krb5 )
 	jpeg2k? ( media-libs/jasper )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
+	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
 	fam? ( virtual/fam )
 	virtual/ghostscript
 	utempter? ( sys-libs/libutempter )
@@ -55,7 +55,8 @@
 	x11-apps/rgb
 	x11-apps/iceauth"
 
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
+	    bindist? ( kde-misc/kdnssd-avahi )"
 
 # Testing code is rather broken and merely for developer purposes, so disable it.
 RESTRICT="test"
@@ -125,10 +126,10 @@
 			$(use_enable kernel_linux sendfile) --enable-mitshm
 			$(use_with spell aspell)"
 
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
+	if use avahi || use bindist ; then
 		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-dnssd"
 	fi
 
 	if has_version x11-apps/rgb; then
@@ -167,7 +168,7 @@
 	fi
 
 	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
+	if use avahi || use bindist ; then
 		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
 	fi