--- /var/cache/portage/gentoo/media-sound/murmur/murmur-1.2.0_pre20090911.ebuild	2009-09-13 14:22:30.000000000 +0200
+++ /var/cache/portage/local/media-sound/murmur/murmur-1.2.0_pre20090911.ebuild	2009-10-21 12:09:01.000000000 +0200
@@ -17,7 +17,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+dbus debug +ice pch zeroconf"
+IUSE="+dbus debug +ice pch zeroconf avahi"
 
 RDEPEND="dev-libs/openssl
 	>=dev-libs/protobuf-2.2.0
@@ -35,6 +35,12 @@
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	if use avahi && use ! zeroconf ; then
+		eerror "'avahi' is a suboption to the 'zeroconf' useflag"
+		eerror "You need to enable zeroconf to get Bonjour functionality"
+		die "'avahi' is a suboption to the 'zeroconf' useflag"
+	fi
+
 	enewgroup murmur
 	enewuser murmur -1 -1 /var/lib/murmur murmur
 }
@@ -45,6 +51,8 @@
 		"${S}"/scripts/murmur.conf \
 		"${S}"/scripts/murmur.ini.system \
 		|| die "sed failed."
+
+	epatch "${FILESDIR}/murmur-1.2.0_pre20090911-no-avahi.patch"
 }
 
 src_configure() {
@@ -54,6 +62,7 @@
 	use ice || conf_add="${conf_add} no-ice"
 	use pch || conf_add="${conf_add} no-pch"
 	use zeroconf || conf_add="${conf_add} no-bonjour"
+	use avahi || conf_add="${conf_add} no-avahi"
 
 	eqmake4 main.pro -recursive \
 		CONFIG+="${conf_add} \