--- /usr/portage/net-fs/samba-server/samba-server-3.4.3-r1.ebuild	2009-11-04 13:46:45.000000000 +0100
+++ samba-server-3.4.3-r1.ebuild	2009-11-08 01:47:54.000000000 +0100
@@ -14,14 +14,13 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="samba4 acl ads aio avahi caps cluster cups debug doc examples fam ldap quota swat syslog winbind zeroconf"
+IUSE="samba4 acl ads aio caps cluster cups debug doc examples fam ldap quota swat syslog winbind zeroconf"
 
 DEPEND="!<net-fs/samba-3.3
 	ads? ( virtual/krb5 sys-fs/e2fsprogs net-fs/samba-libs[ads] )
 	dev-libs/popt
 	virtual/libiconv
-	avahi? ( net-dns/avahi )
-	zeroconf? ( !avahi? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) )
+	zeroconf? ( net-dns/avahi )
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
 	debug? ( dev-libs/dmalloc )
@@ -88,12 +87,8 @@
 	export ac_cv_header_sys_capability_h=no
 	use caps && export ac_cv_header_sys_capability_h=yes
 
-	local dnssd="--disable-dnssd"
-	use zeroconf && ! use avahi && dnssd="--enable-dnssd"
-
 	# 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
@@ -101,6 +96,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
+	# - zeroconf support via avahi (dnssd disabled, following upstream default)
 
 	econf ${myconf} \
 		--with-piddir=/var/run/samba \
@@ -116,8 +112,8 @@
 		--disable-iprint \
 		$(use_enable fam) \
 		--enable-shared-libs \
-		${dnssd} \
-		$(use_enable avahi) \
+		--disable-dnssd \
+		$(use_enable zeroconf avahi) \
 		--with-fhs \
 		--with-privatedir=/var/lib/samba/private \
 		--with-rootsbindir=/var/cache/samba \