--- /usr/portage/net-fs/samba-client/samba-client-3.4.3.ebuild	2009-10-29 21:38:16.000000000 +0100
+++ samba-client-3.4.3.ebuild	2009-11-08 01:35:48.000000000 +0100
@@ -14,7 +14,7 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="samba4 ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
+IUSE="samba4 ads aio caps cluster cups debug ldap minimal syslog winbind zeroconf"
 
 DEPEND="!<net-fs/samba-3.3
 	!net-fs/mount-cifs
@@ -24,7 +24,7 @@
 		dev-libs/popt
 		dev-libs/iniparser
 		virtual/libiconv
-		zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
+		zeroconf? ( net-dns/avahi )
 		caps? ( sys-libs/libcap )
 		cups? ( net-print/cups )
 		debug? ( dev-libs/dmalloc )
@@ -96,7 +96,6 @@
 	if ! use minimal || use ads; then
 		# Notes:
 		# - FAM is a plugin for the server
-		# - DNS-SD is only used in client/server code
 		# - AFS is a pw-auth-method and only used in client/server code
 		# - AFSACL is a server module
 		# - automount is only needed in conjunction with NIS and we don't have that
@@ -104,7 +103,7 @@
 		# - quota-support is only needed in server-code
 		# - acl-support is only used in server-code
 		# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-		# - current DNS/SD support in the client is via the mdnsresponder-compat api in avahi
+		# - current zeroconf support in the client is via avahi ; dnssd support is disabled (following upstream default)
 		econf ${myconf} \
 			--sysconfdir=/etc/samba \
 			--localstatedir=/var \
@@ -118,8 +117,8 @@
 			--disable-iprint \
 			--disable-fam \
 			--enable-shared-libs \
-			$(use minimal && echo "--disable-dnssd" || echo "$(use_enable avahi dnssd)") \
-			--disable-avahi \
+			$(use minimal && echo "--disable-avahi" || echo "$(use_enable zeroconf avahi)") \
+			--disable-dnssd \
 			--with-fhs \
 			--with-privatedir=/var/lib/samba/private \
 			--with-rootsbindir=/var/cache/samba \