5 files changed, 14 insertions, 1 deletions
diff --git a/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild
index 4583e15e..1717cfd3 100644
--- a/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild
+++ b/net-dns/avahi-gtk/avahi-gtk-0.6.31-r6.ebuild
@@ -36,6 +36,11 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
+MULTILIB_WRAPPED_HEADERS=(
+        # necessary until the UI libraries are ported
+        /usr/include/avahi-ui/avahi-ui.h
+)
+
 src_prepare() {
 	# Make gtk utils optional
 	epatch "${FILESDIR}"/${MY_PN}-0.6.30-optional-gtk-utils.patch
@@ -106,6 +111,7 @@ multilib_src_configure() {
 		--with-distro=gentoo \
 		--disable-python-dbus \
 		--disable-xmltoman \
+		--disable-mono \
 		--disable-monodoc \
 		--disable-pygtk \
 		--enable-glib \
diff --git a/net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild b/net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild
index 1f1b21f2..8e55a3e4 100644
--- a/net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild
+++ b/net-dns/avahi-gtk3/avahi-gtk3-0.6.31-r6.ebuild
@@ -108,6 +108,7 @@ multilib_src_configure() {
 		--with-distro=gentoo \
 		--disable-python-dbus \
 		--disable-xmltoman \
+		--disable-mono \
 		--disable-monodoc \
 		--disable-pygtk \
 		--enable-glib \
diff --git a/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild b/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
index ce71e88e..2b0c7252 100644
--- a/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
+++ b/net-dns/avahi-mono/avahi-mono-0.6.31-r6.ebuild
@@ -39,6 +39,11 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( >=virtual/monodoc-1.1.8 )"
 RDEPEND="${COMMON_DEPEND}"
 
+MULTILIB_WRAPPED_HEADERS=(
+        # necessary until the UI libraries are ported
+        /usr/include/avahi-ui/avahi-ui.h
+)
+
 pkg_setup() {
 	mono-env_pkg_setup
 }
diff --git a/net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild b/net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild
index 0d9e68df..d732105a 100644
--- a/net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild
+++ b/net-dns/avahi-qt/avahi-qt-0.6.31-r6.ebuild
@@ -108,6 +108,7 @@ multilib_src_configure() {
 		--with-distro=gentoo \
 		--disable-python-dbus \
 		--disable-xmltoman \
+		--disable-mono \
 		--disable-monodoc \
 		--disable-pygtk \
 		--enable-glib \
diff --git a/net-dns/avahi/avahi-0.6.31-r5.ebuild b/net-dns/avahi/avahi-0.6.31-r5.ebuild
index 18ca5eb4..6fcd7c9a 100644
--- a/net-dns/avahi/avahi-0.6.31-r5.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="System which facilitates service discovery on a local network (meta
 HOMEPAGE="http://avahi.org/"
 SRC_URI=""
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"