--- /usr/portage/net-dns/avahi/avahi-0.6.31-r4.ebuild	2014-02-08 17:48:03.000000000 -0700
+++ avahi-0.6.31-r4.ebuild	2014-05-01 09:13:45.376369853 -0600
@@ -9,7 +9,7 @@
 
 WANT_AUTOMAKE=1.11
 
-inherit autotools eutils flag-o-matic multilib mono-env python-r1 systemd user
+inherit autotools-multilib eutils flag-o-matic multilib mono-env python-r1 systemd user
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -29,22 +29,21 @@
 "
 
 COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
+	dev-libs/libdaemon[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
 	qt4? ( dev-qt/qtcore:4 )
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	dbus? ( sys-apps/dbus )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	kernel_linux? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( dev-libs/gobject-introspection[${MULTILIB_USEDEP}] )
 	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
+		dev-lang/mono[${MULTILIB_USEDEP}]
+		gtk? ( dev-dotnet/gtk-sharp[${MULTILIB_USEDEP}] )
 	)
 	python? (
-		${PYTHON_DEPS}
 		gtk? ( dev-python/pygtk )
 		dbus? ( dev-python/dbus-python )
 	)
@@ -122,76 +117,95 @@
 	>py-compile
 
 	eautoreconf
-}
 
-src_configure() {
+	# Needed only to copy precompiled man pages
+	multilib_copy_sources
+
 	use sh && replace-flags -O? -O0
+}
 
-	local myconf="--disable-static"
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+	)
 
 	if use python; then
 		python_export_best
-		myconf+="
+		myeconfargs+=(
 			$(use_enable dbus python-dbus)
 			$(use_enable gtk pygtk)
-		"
+		)
+		
 	fi
 
 	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
+		myeconfargs+=(
+			$(use_enable doc monodoc)
+		)
 	fi
 
 	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
 	unset DISPLAY
 
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		${myconf}
+	myeconfargs+=(
+		--localstatedir="${EPREFIX}/var"
+		--with-distro=gentoo
+		--disable-python-dbus
+		--disable-pygtk
+		--disable-xmltoman
+		--disable-monodoc
+		--enable-glib
+		--enable-gobject
+		$(use_enable test tests)
+		$(use_enable autoipd)
+		$(use_enable mdnsresponder-compat compat-libdns_sd)
+		$(use_enable howl-compat compat-howl)
+		$(use_enable doc doxygen-doc)
+		$(use_enable mono)
+		$(use_enable dbus)
+		$(use_enable python)
+		$(use_enable nls)
+		$(use_enable introspection)
+		--disable-qt3
+		$(use_enable gdbm)
+		$(systemd_with_unitdir)
+		)
+	if multilib_build_binaries; then
+		myeconfargs+=(
+			$(use_enable utils gtk-utils)
+			$(use_enable gtk)
+			$(use_enable gtk3)
+			$(use_enable qt4)
+		)
+	fi
+	autotools-multilib_src_configure
 }
 
 src_compile() {
-	emake || die "emake failed"
+	autotools-multilib_src_compile
 
 	use doc && { emake avahi.devhelp || die ; }
 }
 
+_avahi_multilib_install() {
+	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
+}
+
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
+	autotools-multilib_src_install
+
 	use bookmarks && use python && use dbus && use gtk || \
 		rm -f "${ED}"/usr/bin/avahi-bookmarks
 
-	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
+	multilib_parallel_foreach_abi _avahi_multilib_install
 	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
 
 	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
+		# /lib is correct here (either a symlink to the default libdir or non-abi-specific)
+		insinto /lib/rcscripts/net
 		doins "${FILESDIR}"/autoipd.sh || die
 
-		insinto /$(get_libdir)/rc/net
+		insinto /lib/rc/net
 		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
 	fi