--- avahi-0.6.30-r1.ebuild	2011-10-30 13:08:57.000000000 +0100
+++ avahi-0.6.30-r3.ebuild	2012-01-19 11:50:30.000000000 +0100
@@ -101,6 +101,16 @@
 	# Make gtk utils optional
 	epatch "${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch"
 
+	#Fix init scripts
+	epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
+
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	epatch "${FILESDIR}"/${P}-automake-1.11.2.patch #397477
+
 	eautoreconf
 }
 
@@ -162,7 +172,7 @@
 }
 
 src_install() {
-	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
+	emake install DESTDIR="${D}" || die "make install failed"
 	use bookmarks && use python && use dbus && use gtk || \
 		rm -f "${ED}"/usr/bin/avahi-bookmarks
 
@@ -185,8 +195,10 @@
 		doins avahi.devhelp || die
 	fi
 
+	use python && python_convert_shebangs -r 2 "${ED}"/usr/bin #396339
+
 	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
 }
 
 pkg_postrm() {