--- /usr/portage/net-dns/avahi/avahi-0.6.31-r7.ebuild	2014-11-22 23:32:32.000000000 +0000
+++ avahi-0.6.31-r8.ebuild	2014-12-07 11:43:22.000000000 +0000
@@ -19,26 +19,28 @@
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
+IUSE="autoipd bookmarks chroot daemon dbus doc gdbm glib gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils xml"
 
 REQUIRED_USE="
+	chroot? ( kernel_linux )
 	utils? ( || ( gtk gtk3 ) )
 	python? ( dbus gdbm )
 	mono? ( dbus )
 	howl-compat? ( dbus )
+	introspection? ( glib )
 	mdnsresponder-compat? ( dbus )
 "
 
 COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	daemon? ( dev-libs/libdaemon )
+	xml? ( dev-libs/expat )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
 	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
+	chroot? ( sys-libs/libcap )
 	introspection? ( dev-libs/gobject-introspection )
 	mono? (
 		dev-lang/mono
@@ -160,7 +162,7 @@
 		myconf+=( $(multilib_native_use_enable doc monodoc) )
 	fi
 
-	if ! multilib_is_native_abi; then
+	if ! ( use daemon && multilib_is_native_abi ); then
 		myconf+=(
 			# used by daemons only
 			--disable-libdaemon
@@ -175,8 +177,8 @@
 		--disable-pygtk \
 		--disable-xmltoman \
 		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
+		$(use_enable glib) \
+		$(use_enable glib gobject) \
 		$(multilib_native_use_enable test tests) \
 		$(multilib_native_use_enable autoipd) \
 		$(use_enable mdnsresponder-compat compat-libdns_sd) \
@@ -194,6 +196,7 @@
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
 		$(systemd_with_unitdir) \
+		$(usex xml '' --with-xml=none) \
 		"${myconf[@]}"
 }