Avahi bump

7 files changed, 237 insertions, 274 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 202262d9..8563dab6 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -2,13 +2,16 @@ AUX autoipd-openrc.sh 700 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e27
 AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 WHIRLPOOL b33889de73f571b18da092342be6a47e71d608466aa0d94fa3f0d8d7e373265767a62bdfb82df31059549e4ec0d05aacef89f1778ea561152fd5e1970072584c
 AUX avahi-0.6.28-CVE-2011-1002.patch 2076 SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97 SHA512 f5331d750a4cb20ecc814699edf252ec0894a2b3294a42300e8f2ab305245444b59376ff7dc535ad2e614f2b56fa5492fe4c103fbca1e6ece885204c8218d149 WHIRLPOOL 8c4bb40764639376510355f6822dd02f6f7d0d2923e9ef657f7c3c591f8866993b7bdae57cceb089ad6704a6f505f1b0a38b2dd28a8966d9bb37a1cc5b6bfa5b
 AUX avahi-0.6.30-optional-gtk-utils.patch 2422 SHA256 1233ba93af567117091094921e5ba76f205b1d984fd5a97153c2004f8f0509e3 SHA512 3ea7f7cd0074286bbe474f783ea9638abef7f68d9466d4f5d4d3a0bc6624a43e48bb293f02f2dd08413d5dcf3f99161e0f45537c5f922b1a326375d40b574596 WHIRLPOOL 82a61a4bce9547e15d6370cd856ac020bcdf9ad220f20929d5c64909c0505406e09fa8503aa79c835477811be48e9c72fbcbfc12061c49722431db196c0cbb8c
+AUX avahi-0.6.31-fix-install-avahi-discover.patch 715 SHA256 79da591066f1ddb454f4d7b7ed7163a0d13c332462ac0c2db3e8a6cd130f8441 SHA512 0cdcf41bbd25caea84a62054c4081dfdba1d421cef56babebe33f480a8ba9af1362c7b698803c17132ee78716439ec70cd5d71f7c85b5d49ba9bda471466cb79 WHIRLPOOL 3b5aa85769688a070707e2a03cccbb4861465bad7b03f5d6e34819dbe2dda5934b332934102616d0a0910cddf80150497f15df19d53726850e1a64d0c48e34d9
+AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 SHA256 257685dde4c7dc78b9fbfeab5f213a94121c8bff6ae8fff99a9aae7eeaa34442 SHA512 659d36b06bf721664105bf51a1610186700004dea2af5dc43e29a8d688e903fb0c69416b1b98957de902901fc5ed04fdd252d30e23f680608608e6f633b94b17 WHIRLPOOL e258af6f138ab7b838a8886d74b73f8d44aefea981bd3e876cca41a144081ad4d199f9ba4031fda71c5d78578869fadd1b226a11b101df406fa2d85911d06e81
+AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10ff05d051ff1d7218d58e5bf3a3fbe8628a439 SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1 WHIRLPOOL 864804ca378b2ef83766ba10e08998f0524ed8c2f6c5fe491eefe88dac2184a3b20848258cd7d19af10a50bbbe8567928c3762b00896bb32b18fda6a4d117c19
+AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67
 AUX netlink-request-all-matches-when-requesting-interface.patch 1634 SHA256 163db2141b278a07433e7d1b51227493555ca7ba1faf2d19c97e20aa51b947cd SHA512 d02e4359152644622c2e52866f150b1cf70d699885f4fad02696113eab9dba5c1954efeb2975de71cc3f8077675ede92409c67e6acfee5d2e86a72281007d545 WHIRLPOOL 3b79b4482663d44d7cd04c64b3b29341f1f00164d227d639630e53616a13b9b17692aecc940157cb984114bb3ed02e5ad14bfe2fe8177898976c240e1773314a
 DIST avahi-0.6.28.tar.gz 1238660 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
-DIST avahi-0.6.29.tar.gz 1244081 SHA256 4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8
-DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
+DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f SHA512 1b0ad0d509fd5e18c651ebe432d4cc85a62cb96e0b240a769ea2f600944eb90d143e4e5abb9057f7bc1a421b4aa743cf483fe8a888b4f63cab61577eda08d7f4 WHIRLPOOL 0c503606adb07741c5ef30b0f8af858cac97e5bf6e36549ed41bb1c76884e27fe234dffe1f8320e7c5570a3cf0032351d6b4c3d2c8905a1be832cb1bdce562e9
+DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
 EBUILD avahi-0.6.28-r1.ebuild 4966 SHA256 c2c7ffd115821b50bb6d8d35452d9167530ce676a794a8d3378767d53d702672 SHA512 e914adf62b20200042a3280937962dcadd9e53fbf9c8372de962d8614aa06bd5fc970544891e13653e188c36e953acbfb58c93cbd903226173ed9baf253be70d WHIRLPOOL 8df4af44593d409e67715b8b2e2c4dd3262297fff549a64924d54ae989c71d558e6e539ed8c69857dd5464767afe11f23d7e1279fde42b3333bffcda3abf634a
-EBUILD avahi-0.6.29.ebuild 4845 SHA256 e0dc5056d2e2c042af01911d6e9c2be929e667e1ece0da2380a2427748b0934b SHA512 0bd30cf20a27eb932351312dbdc4fe85409b408c0d6653852e05422e7d539fb7080b3e36784ca988bd2a5c9a5d1e0df8baf506fb037356a4ee8a50f4c7445841 WHIRLPOOL 93e3464b3e1ae7c02a8bc64c6d92ad8d364f43cf0486b6c2a48f6977fdd7e44db5bc67552829b28bfb53b80786f76a2ca4361b6ad613fbcda22e7c53c2c06476
 EBUILD avahi-0.6.30-r1.ebuild 5358 SHA256 b299f8e843e7e69b9ef8f0dbae7ef53583f6716ab6fdff6f3ccaa275c7ce4b7b SHA512 dd68dd4d66e36098c4cc0078e3bab5fc991220a2d30e096a70ecd5e20c99dd387ff29fecf87603eb19b8ffb2b83281035710ae497bbef6167106c4540d4dbf9a WHIRLPOOL c2d30cbaacf8cfc1e1758ea53aee39111835f48f1063ceab8c491e1f18e48045c6b69b60ec0a87664e813eb028e5c001e225208dc8224c136f5eeeab4bc7e3e2
-EBUILD avahi-0.6.30.ebuild 4870 SHA256 16b13f0e27d53ec891e28be88306f93a048578d8bd1007994ac4c8477232f510 SHA512 3ec428529a4844ae70b7091a0fe08bb176863a7c0029b8e3b9fe3efe42c37eeaebd94eeea720958d8b898e5cff3ae44b7ecda88ff0e1b228a4721e98e90d64d6 WHIRLPOOL 9fb4b35842f00e8c4252a253319eb0a454174a8eaa5081e1795bb5eb33ff944efcdb2f0ef19dc30e3e29875e4ce5ba51cf68dfee045bbf740f006218d390eb0e
+EBUILD avahi-0.6.31-r2.ebuild 5138 SHA256 2814b1c3d27db864555df67235f9fd8a912ef10ecde988bcd6cb9a670f34e3d8 SHA512 296a65ddec09762e2e5055653fa1159d8a93fbeaa18fe63a29d38a01fd5eafdca8f6882c7eba5b94c56552d63965569f93ecc1806a109d5231159c6c46abf7d3 WHIRLPOOL 833c22b6d7b6bade470be3245907411eadcc342db2d2f960faa0c2a90645b7e1155675d6c36b8f4036bac6060140f7886616119f790795afaa042f5097fbda6f
 MISC ChangeLog 30875 SHA256 fb9a0aab47238749181692d918e55b7bd82316ee744341fc0004826316e556f0 SHA512 228b4e528c476c81c9312434f2ce79213d9505d62b7fbeb03b134d46f39ffdc1fc039de3d9c182499a58d6a965eb7faf81a02e3f87928cd252458bb957a58f13 WHIRLPOOL 74c1adb950db409e1274849d861b18cbf3f4a321e719c83ac8b3c4e09012814c6f6fc505a50448d8081aae98ed0a4c7a4719320ff086f49e5c3d16ffbee82d19
 MISC metadata.xml 913 SHA256 1a95241251d48972e68bfc61d6ed70722991e837d3b01c11bf14860f7231d68e SHA512 0d15283f054a418c508c9cf663ec9fd66fe0d93ac7dfbdb3e3247e2366b7a5247fe08cbb8866aea1b71f9a8da6247369672089d83cbf87653bb461e93088e67b WHIRLPOOL 9dbc29b77342b58cb65787412ea28395cbabd781a0dcd1ca179a0a1e54d039641265d2da78b9dac184339141b48d6b0dc65f01c8d5cfed78bdb9cf60d4215142
diff --git a/net-dns/avahi/avahi-0.6.29.ebuild b/net-dns/avahi/avahi-0.6.29.ebuild
deleted file mode 100644
index e9c88993..00000000
--- a/net-dns/avahi/avahi-0.6.29.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29.ebuild,v 1.1 2011/03/17 07:11:30 swegener Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils mono python multilib flag-o-matic
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test "
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-RDEPEND=">=dev-libs/libdaemon-0.14
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt3? ( dev-qt/qt-meta:3 )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.14.0:2
-	)
-	dbus? (
-		${DBUS_DEPEND}
-		python? ( dev-python/dbus-python )
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? (
-		!net-misc/howl
-		${DBUS_DEPEND}
-	)
-	mdnsresponder-compat? (
-		!net-misc/mDNSResponder
-		${DBUS_DEPEND}
-	)
-	python? (
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.5
-	>=dev-util/pkgconfig-0.9.0
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use python && ! use dbus && ! use gtk; then
-		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf=""
-
-	if use python; then
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# these require dbus enabled
-	if use mdnsresponder-compat || use howl-compat || use mono; then
-		myconf+=" --enable-dbus"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	# Upstream ships a gir file (AvahiCore.gir) which does not work with
-	# >=gobject-introspection-0.9, so we disable introspection for now.
-	# http://avahi.org/ticket/318
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--disable-introspection \
-		--enable-glib \
-		$(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) \
-		--disable-gtk3 \
-		$(use_enable gtk) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${D}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
-	if use autoipd; then
-		echo
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-	fi
-
-	if use dbus; then
-		echo
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.30.ebuild b/net-dns/avahi/avahi-0.6.31-r2.ebuild
index 1e40ee5b..5bdaf858 100644
--- a/net-dns/avahi/avahi-0.6.30.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30.ebuild,v 1.2 2011/08/06 09:41:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r2.ebuild,v 1.14 2013/10/12 12:14:46 pacho Exp $
 
-EAPI="3"
+EAPI="5"
 
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
 
-inherit eutils mono python multilib flag-o-matic
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils mono python-r1 multilib flag-o-matic user systemd
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -16,61 +17,57 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test "
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-RDEPEND=">=dev-libs/libdaemon-0.14
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils"
+
+REQUIRED_USE="
+	utils? ( || ( gtk gtk3 ) )
+	python? ( dbus gdbm )
+	mono? ( dbus )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-libs/libdaemon
 	dev-libs/expat
-	>=dev-libs/glib-2
+	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( dev-qt/qt-meta:3 )
 	qt4? ( dev-qt/qtcore:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.14.0:2
-	)
-	dbus? (
-		${DBUS_DEPEND}
-		python? ( dev-python/dbus-python )
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	dbus? ( sys-apps/dbus )
+	kernel_linux? ( sys-libs/libcap )
+	introspection? ( dev-libs/gobject-introspection )
 	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? (
-		!net-misc/howl
-		${DBUS_DEPEND}
-	)
-	mdnsresponder-compat? (
-		!net-misc/mDNSResponder
-		${DBUS_DEPEND}
+		dev-lang/mono
+		gtk? ( dev-dotnet/gtk-sharp )
 	)
 	python? (
-		gtk? ( >=dev-python/pygtk-2 )
+		gtk? ( dev-python/pygtk )
+		dbus? ( dev-python/dbus-python )
 	)
 	bookmarks? (
-		dev-python/twisted
+		dev-python/twisted-core
 		dev-python/twisted-web
 	)
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.5
-	>=dev-util/pkgconfig-0.9.0
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
+	)
+"
 
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use python && ! use dbus && ! use gtk; then
-		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
-	fi
-}
+RDEPEND="
+	${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+"
 
 pkg_preinst() {
 	enewgroup netdev
@@ -93,14 +90,41 @@ src_prepare() {
 	sed -i\
 		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
 		doxygen_to_devhelp.xsl || die
+
+	# Make gtk utils optional
+	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# install-exec-local -> install-exec-hook
+	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
 }
 
 src_configure() {
 	use sh && replace-flags -O? -O0
 
-	local myconf=""
+	local myconf="--disable-static"
 
 	if use python; then
+		python_export_best
 		myconf+="
 			$(use_enable dbus python-dbus)
 			$(use_enable gtk pygtk)
@@ -111,17 +135,9 @@ src_configure() {
 		myconf+=" $(use_enable doc monodoc)"
 	fi
 
-	# these require dbus enabled
-	if use mdnsresponder-compat || use howl-compat || use mono; then
-		myconf+=" --enable-dbus"
-	fi
-
 	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
 	unset DISPLAY
 
-	# Upstream ships a gir file (AvahiCore.gir) which does not work with
-	# >=gobject-introspection-0.9, so we disable introspection for now.
-	# http://avahi.org/ticket/318
 	econf \
 		--localstatedir="${EPREFIX}/var" \
 		--with-distro=gentoo \
@@ -129,8 +145,8 @@ src_configure() {
 		--disable-pygtk \
 		--disable-xmltoman \
 		--disable-monodoc \
-		--disable-introspection \
 		--enable-glib \
+		--enable-gobject \
 		$(use_enable test tests) \
 		$(use_enable autoipd) \
 		$(use_enable mdnsresponder-compat compat-libdns_sd) \
@@ -139,11 +155,14 @@ src_configure() {
 		$(use_enable mono) \
 		$(use_enable dbus) \
 		$(use_enable python) \
-		--disable-gtk3 \
 		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable introspection) \
+		$(use_enable utils gtk-utils) \
 		$(use_enable qt3) \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
 		${myconf}
 }
 
@@ -154,7 +173,7 @@ src_compile() {
 }
 
 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
 
@@ -176,24 +195,15 @@ src_install() {
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi
-}
 
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
 	if use autoipd; then
-		echo
+		elog
 		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
 		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-	fi
-
-	if use dbus; then
-		echo
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
+		elog
 	fi
 }
diff --git a/net-dns/avahi/files/avahi-0.6.31-fix-install-avahi-discover.patch b/net-dns/avahi/files/avahi-0.6.31-fix-install-avahi-discover.patch
new file mode 100644
index 00000000..62ba967c
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-fix-install-avahi-discover.patch
@@ -0,0 +1,31 @@
+--- avahi-0.6.30.old/avahi-python/avahi-discover/Makefile.am	2010-06-28 23:30:34.000000000 -0400
++++ avahi-0.6.30/avahi-python/avahi-discover/Makefile.am	2012-04-21 18:02:01.642934527 -0400
+@@ -22,6 +22,7 @@
+ 	avahi-discover.py \
+ 	avahi-discover.desktop.in.in
+ 
++if ENABLE_GTK_UTILS
+ if HAVE_PYTHON
+ if HAVE_PYTHON_DBUS
+ if HAVE_PYGTK
+@@ -67,3 +68,4 @@
+ endif
+ endif
+ endif
++endif
+--- avahi-0.6.30.old/man/Makefile.am	2012-04-21 18:10:45.690900742 -0400
++++ avahi-0.6.30/man/Makefile.am	2012-04-21 18:09:15.146906578 -0400
+@@ -65,11 +65,13 @@
+ man_MANS += \
+ 	avahi-bookmarks.1
+ if HAVE_GTK
++if ENABLE_GTK_UTILS
+ man_MANS += \
+ 	avahi-discover.1
+ endif
+ endif
+ endif
++endif
+ 
+ if ENABLE_AUTOIPD
+ if HAVE_LIBDAEMON
diff --git a/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch b/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch
new file mode 100644
index 00000000..17ecba52
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch
@@ -0,0 +1,85 @@
+From: David Zeuthen <zeuthen@chromium.org>
+Date: Tue, 5 Mar 2013 19:52:38 +0000 (-0800)
+Subject: avahi-daemon: add option "host-name-from-machine-id="
+X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=147cdce70b22ae7cee9fb4fe123db40952f31c9e
+
+avahi-daemon: add option "host-name-from-machine-id="
+
+Signed-off-by: David Zeuthen <zeuthen@chromium.org>
+---
+
+diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
+index d46f40a..8c28fd6 100644
+--- a/avahi-daemon/main.c
++++ b/avahi-daemon/main.c
+@@ -65,6 +65,7 @@
+ #include <avahi-core/publish.h>
+ #include <avahi-core/dns-srv-rr.h>
+ #include <avahi-core/log.h>
++#include <avahi-core/util.h>
+ 
+ #ifdef ENABLE_CHROOT
+ #include "chroot.h"
+@@ -576,6 +577,29 @@ static int parse_usec(const char *s, AvahiUsec *u) {
+     return 0;
+ }
+ 
++static char *get_machine_id(void) {
++    int fd;
++    char buf[32];
++
++    fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
++    if (fd == -1 && errno == ENOENT)
++        fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
++    if (fd == -1)
++        return NULL;
++
++    /* File is on a filesystem so we never get EINTR or partial reads */
++    if (read(fd, buf, sizeof buf) != sizeof buf) {
++        close(fd);
++        return NULL;
++    }
++    close(fd);
++
++    /* Contents can be lower, upper and even mixed case so normalize */
++    avahi_strdown(buf);
++
++    return avahi_strndup(buf, sizeof buf);
++}
++
+ static int load_config_file(DaemonConfig *c) {
+     int r = -1;
+     AvahiIniFile *f;
+@@ -631,6 +655,15 @@ static int load_config_file(DaemonConfig *c) {
+                     c->server_config.use_iff_running = is_yes(p->value);
+                 else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
+                     c->server_config.disallow_other_stacks = is_yes(p->value);
++                else if (strcasecmp(p->key, "host-name-from-machine-id") == 0) {
++                    if (*(p->value) == 'y' || *(p->value) == 'Y') {
++                        char *machine_id = get_machine_id();
++                        if (machine_id != NULL) {
++                            avahi_free(c->server_config.host_name);
++                            c->server_config.host_name = machine_id;
++                        }
++                    }
++                }
+ #ifdef HAVE_DBUS
+                 else if (strcasecmp(p->key, "enable-dbus") == 0) {
+ 
+diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
+index bea7ed5..2d15017 100644
+--- a/man/avahi-daemon.conf.5.xml.in
++++ b/man/avahi-daemon.conf.5.xml.in
+@@ -40,6 +40,12 @@
+     </option>
+ 
+     <option>
++      <p><opt>host-name-from-machine-id=</opt> Takes a boolean
++      value ("yes" or "no"). If set to "yes" avahi-daemon
++      will use the machine-id as name on the LAN.</p>
++    </option>
++
++    <option>
+       <p><opt>domain-name=</opt> Set the default domain name avahi-daemon
+       tries to register its host name and services on the LAN in. If
+       omitted defaults to ".local".</p>
diff --git a/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch b/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
new file mode 100644
index 00000000..d9a7bc34
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
@@ -0,0 +1,11 @@
+--- avahi-0.6.31/avahi-utils/Makefile.am
++++ avahi-0.6.31/avahi-utils/Makefile.am
+@@ -53,7 +53,7 @@
+ avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
+ avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+ 
+-install-exec-local:
++install-exec-hook:
+ 	cd $(DESTDIR)/$(bindir) && \
+ 		rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
+ 		$(LN_S) avahi-resolve avahi-resolve-host-name && \
diff --git a/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch b/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
new file mode 100644
index 00000000..394f6d34
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
@@ -0,0 +1,22 @@
+--- avahi-0.6.30/initscript/gentoo/avahi-daemon.in
++++ avahi-0.6.30/initscript/gentoo/avahi-daemon.in
+@@ -2,7 +2,7 @@
+ # Copyright 1999-2007 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ 
+-opts="reload"
++extra_started_commands="reload"
+ 
+ depend() {
+ 	before netmount nfsmount
+--- avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
++++ avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
+@@ -2,7 +2,7 @@
+ # Copyright 1999-2007 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ 
+-opts="reload"
++extra_started_commands="reload"
+ 
+ depend() {
+ 	need avahi-daemon