[net-dns/avahi] Update from main portage tree

8 files changed, 60 insertions, 475 deletions

diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index b0eb83af..72510213 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -611,8 +611,6 @@
 =media-video/subtitlecomposer-0.4.3-r1
 =net-analyzer/knetscan-1.0-r1
 =net-analyzer/ksniffer-0.3.2
-=net-dns/avahi-0.6.24-r2
-=net-dns/avahi-0.6.25
 =net-dns/avahi-0.6.25-r1
 =net-dns/avahi-0.6.27
 =net-dns/avahi-0.6.27-r1
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index bdf4ee9d..c278e92f 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/avahi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.190 2010/12/14 00:27:52 swegener Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.192 2011/01/23 20:24:45 swegener Exp $
+
+  23 Jan 2011; Sven Wegener <swegener@gentoo.org> avahi-0.6.28.ebuild,
+  +files/netlink-request-all-matches-when-requesting-interface.patch:
+  Add bugfix patch to support kernels >=2.6.38, bug #352070.
+
+  23 Jan 2011; Sven Wegener <swegener@gentoo.org> -avahi-0.6.24-r2.ebuild,
+  -files/avahi-0.6.24-CVE-2009-0758.patch, -avahi-0.6.25.ebuild:
+  Cleanup.
 
   14 Dec 2010; Sven Wegener <swegener@gentoo.org> avahi-0.6.27.ebuild,
   avahi-0.6.27-r1.ebuild, avahi-0.6.28.ebuild:
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f6ff6ba4..add6bf1d 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,18 +1,15 @@
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
-AUX avahi-0.6.24-CVE-2009-0758.patch 953 RMD160 7c1a2a2082c61d6feb05d985068122133b434b02 SHA1 429347d8b9f9022c5316ce1e5163a68fa7393b4f SHA256 e8a93a705ec07ca6a4c4c7634a97b9b2c5ee0712c9e80767c6bf7e3f4a5d6853
 AUX avahi-0.6.24-cmsg_space.patch 449 RMD160 9593ee893daf908e35f36a7396ae5d52a7618022 SHA1 49fd79c1d0e0302747e84bdf611cfb0bf310b4c3 SHA256 f3b6bf6f522aea93627df8afda317782ed760493ffad9108697b50a310bc92d7
 AUX avahi-0.6.24-libintl.patch 542 RMD160 918aa11cdbce6f38d9a9446c798db2bc43a957b5 SHA1 c9f8ef5d0047b591e6e88153731ae380d64a2431 SHA256 fb8e37d6071a990184a7ad3c20a7709554103fb2c4f02450c338b9fbcf358215
 AUX avahi-0.6.27-no-auto-activated.patch 1677 RMD160 c5abd8cab9872c22b57de2158c3cb3117722b206 SHA1 2158ca2c25aa8f81dbb6d376ff00a3ed26932e4b SHA256 907ccacfaf118e88a750ff3699e53b4efed7661bb3d09722f04fc389fe46f12b
-DIST avahi-0.6.24.tar.gz 1115626 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
+AUX netlink-request-all-matches-when-requesting-interface.patch 1642 RMD160 b8c1987c35e2d7fde63ee3971bb6e5cafe37ae43 SHA1 44fe78fda6a2cdfbb92654164fa421450aaec68a SHA256 9b91094b8316d8125a2dc2b118c406e2ae8e5f7760089a041bbf539ff44dc12f
 DIST avahi-0.6.25.tar.gz 1103653 RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
 DIST avahi-0.6.27.tar.gz 1217974 RMD160 36e6a242f0c926351e31871d8a4f8a52a501fdc3 SHA1 e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b SHA256 c22df5e0b0d695bfe3cc52545bf0affc1c52060818a5a65d70055e320bc45e84
 DIST avahi-0.6.28.tar.gz 1238660 RMD160 d61b370baa3f25d57efba43f2c34b54cab7e7e9e SHA1 5da3f7da2cff8ddf74f8746e4dcb2524e5047f67 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
-EBUILD avahi-0.6.24-r2.ebuild 5400 RMD160 f955a49312b3d0b269e08358c1dce3a6ad00f037 SHA1 12f531483b56407b83be6ed2639d79f671c23226 SHA256 8ea2e741aea77123d87ba83f71cdebde92886e8716554916b87a9a79bd67d018
 EBUILD avahi-0.6.25-r1.ebuild 5001 RMD160 a3630d681a75bbb9bb12c2ef86d213750eec6a4a SHA1 3553b0e5b285db42dd303da6459924d2974206e2 SHA256 58cfcd047f3afb58134f851215ebe7e789c2e164874396b65173d9970b7f960a
-EBUILD avahi-0.6.25.ebuild 5352 RMD160 0fb9fe844fba482fbfc95caf8744b71539c55324 SHA1 353f53cbbf73ed27c5b85629fd2e09374f08a251 SHA256 854cb5b236f3109a227970a9aa99904c1f947680a8bef1345c3e98bdc89d0efa
 EBUILD avahi-0.6.27-r1.ebuild 4903 RMD160 00dafea3f3a4ae4281e573a23f7f4ec9bb130eef SHA1 dd637d5b1207bdf455064009647697775752bba7 SHA256 64e24c62269015042226b6bc801852c4576eda04cde4c2b7e59421291d0358ba
 EBUILD avahi-0.6.27.ebuild 4650 RMD160 93703638ec59e9da63b6ba2bd058b94964ac69e4 SHA1 40c43baf69299bad27812f2ab6859da444d8e7d7 SHA256 cc53a733743c9274e846aa6c255bd085c5b612405ae4f73dea147df7380279b7
-EBUILD avahi-0.6.28.ebuild 4783 RMD160 bff589f583c972e493257c9472f7e4f2d562850e SHA1 8879429e6c1ce92eab80c3c250c959de09b2aa83 SHA256 e26a9838720beb28e26cc7ec78e0de1568f95483c45a5415f3badf81c9d1d725
-MISC ChangeLog 28322 RMD160 a4d40e707ed13ccd407987eb02142726672865f2 SHA1 3e2d47981a67dabd89a769179b824cd8507ef1e1 SHA256 0f38c33c391b245cbb8a628f4bb0481f036625cae5c7a1f1472562f04310d365
+EBUILD avahi-0.6.28.ebuild 4866 RMD160 d448c65be1b093d24a5124983dc6cfafd8a83013 SHA1 25199f847c683619d32c989b9b51f985c187928e SHA256 55280d5880a8938f7080c4e2363aedb9f217eb10387719d6c17b35d605652ec8
+MISC ChangeLog 28677 RMD160 38ef51e905cb309cb02cc841c4a6b25eb406ce99 SHA1 f3e6573a727ac7cfa4479b0a3a2652163235e6b1 SHA256 514f03e6017aec0b49ea201bdd14bb0f1faa4172c2a9038aa859e93fab81415c
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
deleted file mode 100644
index 2f62cb73..00000000
--- a/net-dns/avahi/avahi-0.6.24-r2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.14 2010/05/19 19:14:47 arfrever Exp $
-
-EAPI="1"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils mono python multilib autotools 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="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
-
-RDEPEND=">=dev-libs/libdaemon-0.11-r1
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt3? ( x11-libs/qt:3 )
-	qt4? ( x11-libs/qt-core:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0
-		>=gnome-base/libglade-2.4.0
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? (
-			|| (
-				dev-python/dbus-python
-				(
-					<sys-apps/dbus-0.90
-					>=sys-apps/dbus-0.30
-				)
-			)
-		)
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	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
-	fi
-
-	if use python && ! built_with_use "=dev-lang/python-2*" gdbm
-	then
-		die "For python support you need dev-lang/python compiled with gdbm support!"
-	fi
-
-	if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
-	then
-		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
-	fi
-
-	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
-	then
-		die "For *-compat or mono support you also need to enable the dbus USE flag!"
-	fi
-
-	if use bookmarks && ! ( use python && use dbus && use gtk )
-	then
-		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
-	fi
-
-	if use python && ! use dbus && ! use gtk
-	then
-		die "For proper python support you also need 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-
-	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
-
-	rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
-
-	epatch "${FILESDIR}"/avahi-0.6.24-CVE-2009-0758.patch
-	epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
-	epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	use sh && replace-flags -O? -O0
-
-	local myconf=""
-
-	if use python
-	then
-		use dbus && myconf="${myconf} --enable-python-dbus"
-		use gtk && myconf="${myconf} --enable-pygtk"
-	fi
-
-	if use mono && use doc
-	then
-		myconf="${myconf} --enable-monodoc"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--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) \
-		$(use_enable gtk) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-	emake || die "emake failed"
-
-	use doc && emake avahi.devhelp
-}
-
-src_install() {
-	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks || 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
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	if use doc
-	then
-		dohtml -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-
-	if use autoipd
-	then
-		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!"
-		elog
-	fi
-
-	if use dbus
-	then
-		elog
-		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/avahi-0.6.25.ebuild b/net-dns/avahi/avahi-0.6.25.ebuild
deleted file mode 100644
index 256bcb63..00000000
--- a/net-dns/avahi/avahi-0.6.25.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.6 2010/05/19 19:14:47 arfrever Exp $
-
-EAPI="1"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils mono python multilib autotools 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="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
-
-RDEPEND=">=dev-libs/libdaemon-0.11-r1
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt3? ( x11-libs/qt:3 )
-	qt4? ( x11-libs/qt-core:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0
-		>=gnome-base/libglade-2.4.0
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? (
-			|| (
-				dev-python/dbus-python
-				(
-					<sys-apps/dbus-0.90
-					>=sys-apps/dbus-0.30
-				)
-			)
-		)
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	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
-	fi
-
-	if use python && ! built_with_use "=dev-lang/python-2*" gdbm
-	then
-		die "For python support you need dev-lang/python compiled with gdbm support!"
-	fi
-
-	if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
-	then
-		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
-	fi
-
-	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
-	then
-		die "For *-compat or mono support you also need to enable the dbus USE flag!"
-	fi
-
-	if use bookmarks && ! ( use python && use dbus && use gtk )
-	then
-		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
-	fi
-
-	if use python && ! use dbus && ! use gtk
-	then
-		die "For proper python support you also need 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-
-	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
-
-	rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
-
-	epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
-	epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	use sh && replace-flags -O? -O0
-
-	local myconf=""
-
-	if use python
-	then
-		use dbus && myconf="${myconf} --enable-python-dbus"
-		use gtk && myconf="${myconf} --enable-pygtk"
-	fi
-
-	if use mono && use doc
-	then
-		myconf="${myconf} --enable-monodoc"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--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) \
-		$(use_enable gtk) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-	emake || die "emake failed"
-
-	use doc && emake avahi.devhelp
-}
-
-src_install() {
-	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks || 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
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	if use doc
-	then
-		dohtml -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-
-	if use autoipd
-	then
-		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!"
-		elog
-	fi
-
-	if use dbus
-	then
-		elog
-		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/avahi-0.6.28.ebuild b/net-dns/avahi/avahi-0.6.28.ebuild
index d3fdb59f..f8084f2d 100644
--- a/net-dns/avahi/avahi-0.6.28.ebuild
+++ b/net-dns/avahi/avahi-0.6.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.5 2010/12/14 00:27:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.6 2011/01/23 20:24:45 swegener Exp $
 
 EAPI="3"
 
@@ -93,6 +93,8 @@ src_prepare() {
 	sed -i\
 		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
 		doxygen_to_devhelp.xsl || die
+
+	epatch "${FILESDIR}"/netlink-request-all-matches-when-requesting-interface.patch
 }
 
 src_configure() {
diff --git a/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch b/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
deleted file mode 100644
index 57883936..00000000
--- a/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/avahi-core/server.c b/avahi-core/server.c
-index 453db09..8187690 100644
---- a/avahi-core/server.c
-+++ b/avahi-core/server.c
-@@ -844,7 +844,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
-         if (getsockname(s->fd_legacy_unicast_ipv4, (struct sockaddr*) &lsa, &l) != 0)
-             avahi_log_warn("getsockname(): %s", strerror(errno));
-         else
--            return lsa.sin_port == port;
-+            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
- 
-     }
- 
-@@ -855,7 +855,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
-         if (getsockname(s->fd_legacy_unicast_ipv6, (struct sockaddr*) &lsa, &l) != 0)
-             avahi_log_warn("getsockname(): %s", strerror(errno));
-         else
--            return lsa.sin6_port == port;
-+            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
-     }
- 
-     return 0;
diff --git a/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch b/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch
new file mode 100644
index 00000000..2cd1afd1
--- /dev/null
+++ b/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch
@@ -0,0 +1,43 @@
+From 882da7d7385e51024bc64a08a21cfd86cc55f3d1 Mon Sep 17 00:00:00 2001
+From: Andy Whitcroft <apw@canonical.com>
+Date: Tue, 18 Jan 2011 10:30:58 +0000
+Subject: [PATCH] netlink: request all matches when requesting interface and address lists
+
+When requesting the a full list of interfaces and addresses for the machine
+avahi uses a wild card netlink search.  This is done via a NLM_F_ROOT
+request.  However we do not correctly request NLM_F_MATCH indicating
+we want all matches.  This leads to the requests returning EINVAL on
+v2.6.38-rc1 and later kernels and to the daemon hanging during startup.
+
+Prior to v2.6.38-rc1 bugs in the kernel caused NLM_F_ROOT to incorrectly
+imply NLM_F_MATCH, see the commit below for details:
+
+    commit 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf
+    Author: Jan Engelhardt <jengelh@medozas.de>
+    Date:   Fri Jan 7 03:15:05 2011 +0000
+
+	netlink: test for all flags of the NLM_F_DUMP composite
+
+Add the missing NLM_F_MATCH.
+
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+---
+ avahi-core/iface-linux.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
+index a1b7f73..9a0bbb6 100644
+--- a/avahi-core/iface-linux.c
++++ b/avahi-core/iface-linux.c
+@@ -53,7 +53,7 @@ static int netlink_list_items(AvahiNetlink *nl, uint16_t type, unsigned *ret_seq
+     n = (struct nlmsghdr*) req;
+     n->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg));
+     n->nlmsg_type = type;
+-    n->nlmsg_flags = NLM_F_ROOT|NLM_F_REQUEST;
++    n->nlmsg_flags = NLM_F_MATCH|NLM_F_ROOT|NLM_F_REQUEST;
+     n->nlmsg_pid = 0;
+ 
+     gen = NLMSG_DATA(n);
+-- 
+1.7.1
+