public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde-sunset:master commit in: Documentation/package.unmask/, net-dns/avahi/, net-dns/avahi/files/
@ 2011-03-03  8:13 Martin von Gagern
  0 siblings, 0 replies; 3+ messages in thread
From: Martin von Gagern @ 2011-03-03  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     56aa3ca647fc88eb78b43d5b58f903c0b29b2640
Author:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
AuthorDate: Thu Mar  3 08:12:29 2011 +0000
Commit:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
CommitDate: Thu Mar  3 08:12:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=56aa3ca6

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

---
 Documentation/package.unmask/kde-3.5               |    1 +
 net-dns/avahi/ChangeLog                            |   22 ++-
 net-dns/avahi/avahi-0.6.28-r1.ebuild               |  202 ++++++++++++++++++++
 .../avahi/files/avahi-0.6.28-CVE-2011-1002.patch   |   68 +++++++
 4 files changed, 292 insertions(+), 1 deletions(-)

diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index 7251021..5e4eb21 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -615,6 +615,7 @@
 =net-dns/avahi-0.6.27
 =net-dns/avahi-0.6.27-r1
 =net-dns/avahi-0.6.28
+=net-dns/avahi-0.6.28-r1
 =net-firewall/knetfilter-3.5.0
 =net-im/kmess-1.5.1
 =net-im/kmess-1.5.2

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index c278e92..b27e123 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-dns/avahi
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.197 2011/03/02 08:46:47 tomka Exp $
+
+  02 Mar 2011; Thomas Kahle <tomka@gentoo.org> avahi-0.6.28-r1.ebuild:
+  x86 stable per bug 355583
+
+  01 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  avahi-0.6.28-r1.ebuild:
+  ppc/ppc64 stable wrt #355583
+
+  01 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  avahi-0.6.28-r1.ebuild:
+  Byte-compile avahi_discover only with USE="dbus gtk python" (bug #339933).
+
+  28 Feb 2011; Markos Chandras <hwoarang@gentoo.org> avahi-0.6.28-r1.ebuild:
+  Stable on amd64 wrt bug #355583
+
+*avahi-0.6.28-r1 (27 Feb 2011)
+
+  27 Feb 2011; Sven Wegener <swegener@gentoo.org> +avahi-0.6.28-r1.ebuild,
+  +files/avahi-0.6.28-CVE-2011-1002.patch:
+  Revision bump, security bug #355583.
 
   23 Jan 2011; Sven Wegener <swegener@gentoo.org> avahi-0.6.28.ebuild,
   +files/netlink-request-all-matches-when-requesting-interface.patch:

diff --git a/net-dns/avahi/avahi-0.6.28-r1.ebuild b/net-dns/avahi/avahi-0.6.28-r1.ebuild
new file mode 100644
index 0000000..a6feb6c
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.28-r1.ebuild
@@ -0,0 +1,202 @@
+# 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-r1.ebuild,v 1.5 2011/03/02 08:46:47 tomka 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? ( x11-libs/qt:3 )
+	qt4? ( x11-libs/qt-core: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
+
+	epatch "${FILESDIR}"/netlink-request-all-matches-when-requesting-interface.patch
+	epatch "${FILESDIR}"/${P}-CVE-2011-1002.patch
+}
+
+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/files/avahi-0.6.28-CVE-2011-1002.patch b/net-dns/avahi/files/avahi-0.6.28-CVE-2011-1002.patch
new file mode 100644
index 0000000..9d80477
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.28-CVE-2011-1002.patch
@@ -0,0 +1,68 @@
+From: Vincent Untz <vuntz@opensuse.org>
+Date: Fri, 18 Feb 2011 22:37:00 +0000 (+0100)
+Subject: socket: Still read corrupt packets from the sockets
+X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=46109dfec75534fe270c0ab902576f685d5ab3a6
+
+socket: Still read corrupt packets from the sockets
+
+Else, we end up with an infinite loop with 100% CPU.
+
+http://www.avahi.org/ticket/325
+https://bugzilla.redhat.com/show_bug.cgi?id=667187
+---
+
+diff --git a/avahi-core/socket.c b/avahi-core/socket.c
+index be62105..e69ec7d 100644
+--- a/avahi-core/socket.c
++++ b/avahi-core/socket.c
+@@ -653,10 +653,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
+         goto fail;
+     }
+ 
+-    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
+-    if (!ms)
+-        goto fail;
+-
+     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
+ 
+     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
+@@ -683,10 +679,14 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
+         goto fail;
+     }
+ 
+-    if (sa.sin_addr.s_addr == INADDR_ANY) {
++    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So
++     * fail after having read them. */
++    if (!ms)
++        goto fail;
++
++    if (sa.sin_addr.s_addr == INADDR_ANY)
+         /* Linux 2.4 behaves very strangely sometimes! */
+         goto fail;
+-    }
+ 
+     assert(!(msg.msg_flags & MSG_CTRUNC));
+     assert(!(msg.msg_flags & MSG_TRUNC));
+@@ -810,10 +810,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
+         goto fail;
+     }
+ 
+-    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
+-    if (!ms)
+-        goto fail;
+-
+     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
+ 
+     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
+@@ -841,6 +837,11 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
+         goto fail;
+     }
+ 
++    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So
++     * fail after having read them. */
++    if (!ms)
++        goto fail;
++
+     assert(!(msg.msg_flags & MSG_CTRUNC));
+     assert(!(msg.msg_flags & MSG_TRUNC));
+ 



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde-sunset:master commit in: Documentation/package.unmask/, net-dns/avahi/, net-dns/avahi/files/
@ 2011-03-19 11:53 Martin von Gagern
  0 siblings, 0 replies; 3+ messages in thread
From: Martin von Gagern @ 2011-03-19 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5412c400951b03daa9884e80a95362b567c36410
Author:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
AuthorDate: Sat Mar 19 11:52:47 2011 +0000
Commit:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
CommitDate: Sat Mar 19 11:52:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=5412c400

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

---
 Documentation/package.unmask/kde-3.5               |    5 +-
 net-dns/avahi/ChangeLog                            |   23 ++-
 net-dns/avahi/avahi-0.6.25-r1.ebuild               |  209 --------------------
 net-dns/avahi/avahi-0.6.27-r1.ebuild               |  205 -------------------
 net-dns/avahi/avahi-0.6.27.ebuild                  |  199 -------------------
 net-dns/avahi/avahi-0.6.28-r1.ebuild               |    4 +-
 .../{avahi-0.6.28.ebuild => avahi-0.6.29.ebuild}   |    8 +-
 net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch  |   11 -
 net-dns/avahi/files/avahi-0.6.24-libintl.patch     |   11 -
 .../files/avahi-0.6.27-no-auto-activated.patch     |   37 ----
 ...est-all-matches-when-requesting-interface.patch |   53 +++---
 11 files changed, 54 insertions(+), 711 deletions(-)

diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index 288981f..8f2cce0 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -611,11 +611,8 @@
 =media-video/subtitlecomposer-0.4.3-r1
 =net-analyzer/knetscan-1.0-r1
 =net-analyzer/ksniffer-0.3.2
-=net-dns/avahi-0.6.25-r1
-=net-dns/avahi-0.6.27
-=net-dns/avahi-0.6.27-r1
-=net-dns/avahi-0.6.28
 =net-dns/avahi-0.6.28-r1
+=net-dns/avahi-0.6.29
 =net-firewall/knetfilter-3.5.0
 =net-im/kmess-1.5.1
 =net-im/kmess-1.5.2

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index b27e123..0060d1e 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.197 2011/03/02 08:46:47 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.202 2011/03/17 07:14:41 swegener Exp $
+
+  17 Mar 2011; Sven Wegener <swegener@gentoo.org>
+  files/netlink-request-all-matches-when-requesting-interface.patch:
+  Update netlink patch from git.
+
+*avahi-0.6.29 (17 Mar 2011)
+
+  17 Mar 2011; Sven Wegener <swegener@gentoo.org> +avahi-0.6.29.ebuild:
+  Version bump, bug #358971.
+
+  12 Mar 2011; Sven Wegener <swegener@gentoo.org>
+  -files/avahi-0.6.24-cmsg_space.patch, -files/avahi-0.6.24-libintl.patch,
+  -avahi-0.6.25-r1.ebuild, -avahi-0.6.27.ebuild, -avahi-0.6.27-r1.ebuild,
+  -files/avahi-0.6.27-no-auto-activated.patch, -avahi-0.6.28.ebuild:
+  Cleanup.
+
+  05 Mar 2011; Raúl Porcel <armin76@gentoo.org> avahi-0.6.28-r1.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #355583
+
+  03 Mar 2011; Jeroen Roovers <jer@gentoo.org> avahi-0.6.28-r1.ebuild:
+  Stable for HPPA (bug #355583).
 
   02 Mar 2011; Thomas Kahle <tomka@gentoo.org> avahi-0.6.28-r1.ebuild:
   x86 stable per bug 355583

diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild
deleted file mode 100644
index 5e3151d..0000000
--- a/net-dns/avahi/avahi-0.6.25-r1.ebuild
+++ /dev/null
@@ -1,209 +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-r1.ebuild,v 1.10 2010/08/29 17:48:19 armin76 Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-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 )
-	)
-	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
-		python_pkg_setup
-	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_prepare() {
-	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
-
-	# Fix intltoolize broken file, see GNOME upstream  #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	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_configure() {
-	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}
-}
-
-src_compile() {
-	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 avahi avahi_discover
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize avahi 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.27-r1.ebuild b/net-dns/avahi/avahi-0.6.27-r1.ebuild
deleted file mode 100644
index 8c259c4..0000000
--- a/net-dns/avahi/avahi-0.6.27-r1.ebuild
+++ /dev/null
@@ -1,205 +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.27-r1.ebuild,v 1.3 2010/12/14 00:27:52 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="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.14.0:2
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? ( dev-python/dbus-python )
-	)
-	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
-		python_pkg_setup
-	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_prepare() {
-	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
-
-	epatch "${FILESDIR}"/${P}-no-auto-activated.patch
-}
-
-src_configure() {
-	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
-
-	# 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
-}
-
-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 avahi avahi_discover
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize avahi 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.27.ebuild b/net-dns/avahi/avahi-0.6.27.ebuild
deleted file mode 100644
index 28b960b..0000000
--- a/net-dns/avahi/avahi-0.6.27.ebuild
+++ /dev/null
@@ -1,199 +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.27.ebuild,v 1.2 2010/12/14 00:27:52 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="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.14.0:2
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? ( dev-python/dbus-python )
-	)
-	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
-		python_pkg_setup
-	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_prepare() {
-	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
-}
-
-src_configure() {
-	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) \
-		--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
-}
-
-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 avahi avahi_discover
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize avahi 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-r1.ebuild b/net-dns/avahi/avahi-0.6.28-r1.ebuild
index a6feb6c..8da410e 100644
--- a/net-dns/avahi/avahi-0.6.28-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.28-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.5 2011/03/02 08:46:47 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28-r1.ebuild,v 1.7 2011/03/05 13:42:05 armin76 Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ 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"
+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"

diff --git a/net-dns/avahi/avahi-0.6.28.ebuild b/net-dns/avahi/avahi-0.6.29.ebuild
similarity index 93%
rename from net-dns/avahi/avahi-0.6.28.ebuild
rename to net-dns/avahi/avahi-0.6.29.ebuild
index f8084f2..ee2f066 100644
--- a/net-dns/avahi/avahi-0.6.28.ebuild
+++ b/net-dns/avahi/avahi-0.6.29.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2011/01/23 20:24:45 swegener Exp $
+# $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"
 
@@ -93,8 +93,6 @@ 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() {
@@ -181,11 +179,11 @@ src_install() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup avahi avahi_discover
+	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize avahi avahi_discover
+	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
 
 	if use autoipd; then
 		echo

diff --git a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch b/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
deleted file mode 100644
index 220e63f..0000000
--- a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2009-02-25 11:51:29 +0100
-+++ configure.ac	2009-02-25 11:55:47 +0100
-@@ -348,7 +348,7 @@
-  # Solaris stuff
-  AC_SEARCH_LIBS([inet_ntop],[nsl])
-  AC_SEARCH_LIBS([recv],[socket])
-- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__")
-+ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__", [[#include <sys/socket.h>]])
- 
- # Checks for library functions.
- AC_FUNC_MEMCMP

diff --git a/net-dns/avahi/files/avahi-0.6.24-libintl.patch b/net-dns/avahi/files/avahi-0.6.24-libintl.patch
deleted file mode 100644
index 3ad943a..0000000
--- a/net-dns/avahi/files/avahi-0.6.24-libintl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-common/Makefile.am.orig	2008-12-12 21:33:35 +0100
-+++ avahi-common/Makefile.am	2009-02-25 12:21:14 +0100
-@@ -71,7 +71,7 @@
- 	i18n.c i18n.h
- 
- libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
--libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBINTL)
-+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
- libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
- 
- strlst_test_SOURCES = \

diff --git a/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch b/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch
deleted file mode 100644
index 8a37cd7..0000000
--- a/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git b/avahi-client/client.c a/avahi-client/client.c
-index 2b29480..6435723 100644
---- b/avahi-client/client.c
-+++ a/avahi-client/client.c
-@@ -141,10 +141,9 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message,
- 
-         if (strcmp(name, AVAHI_DBUS_NAME) == 0) {
- 
--            if (old[0] &&
--                avahi_client_is_connected(client)) {
-+            if (avahi_client_is_connected(client)) {
- 
--                /* Regardless if the server lost its name or
-+                /* Regardless if the server lost or acquired its name or
-                  * if the name was transfered: our services are no longer
-                  * available, so we disconnect ourselves */
-                 avahi_client_set_errno(client, AVAHI_ERR_DISCONNECTED);
-@@ -523,7 +522,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags,
-         goto fail;
-     }
- 
--    if (!dbus_connection_add_filter(client->bus, filter_func, client, NULL)) {
-+    if (!dbus_connection_add_filter (client->bus, filter_func, client, NULL)) {
-         if (ret_error)
-             *ret_error = AVAHI_ERR_NO_MEMORY;
-         goto fail;
-@@ -560,7 +559,9 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags,
-     if (dbus_error_is_set(&error))
-         goto fail;
- 
--    if (!dbus_bus_start_service_by_name(client->bus, AVAHI_DBUS_NAME, 0, NULL, &error)) {
-+
-+    if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) ||
-+        dbus_error_is_set(&error)) {
- 
-         /* We free the error so its not set, that way the fail target
-          * will return the NO_DAEMON error rather than a DBUS error */

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
index 2cd1afd..877d97c 100644
--- 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
@@ -1,32 +1,34 @@
-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
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Fri, 18 Feb 2011 17:58:21 +0000 (+0100)
+Subject: netlink: fix wrong use of netlink flags for dump operations
+X-Git-Tag: v0.6.29~17
+X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=65cb5c100eb1e5891f145be0b89aaa3c2d2e4317
 
-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.
+netlink: fix wrong use of netlink flags for dump operations
 
-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:
+The avahi-daemon uses a wrong flag combination to operate with
+rtnetlink. This patch fixes the problems.
 
-    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>
+No need to set NLM_F_ACK since the dump operation already includes
+the trailing NLMSG_DONE message that informs about the end of the
+dump operation.
 ---
- avahi-core/iface-linux.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
 
+diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c
+index fc27829..83e9e41 100644
+--- a/avahi-autoipd/iface-linux.c
++++ b/avahi-autoipd/iface-linux.c
+@@ -262,7 +262,7 @@ int iface_get_initial_state(State *state) {
+     n->nlmsg_len = NLMSG_LENGTH(sizeof(*ifi));
+     n->nlmsg_type = RTM_GETLINK;
+     n->nlmsg_seq = seq;
+-    n->nlmsg_flags = NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK;
++    n->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP;
+     n->nlmsg_pid = 0;
+ 
+     ifi = NLMSG_DATA(n);
 diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
-index a1b7f73..9a0bbb6 100644
+index a1b7f73..4d12f73 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
@@ -34,10 +36,7 @@ index a1b7f73..9a0bbb6 100644
      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_flags = NLM_F_REQUEST|NLM_F_DUMP;
      n->nlmsg_pid = 0;
  
      gen = NLMSG_DATA(n);
--- 
-1.7.1
-



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde-sunset:master commit in: Documentation/package.unmask/, net-dns/avahi/, net-dns/avahi/files/
@ 2011-08-30 20:50 Martin von Gagern
  0 siblings, 0 replies; 3+ messages in thread
From: Martin von Gagern @ 2011-08-30 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     e304fea0b0d4091b44c42f677bf41d2a8e8f6e55
Author:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
AuthorDate: Tue Aug 30 20:50:12 2011 +0000
Commit:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
CommitDate: Tue Aug 30 20:50:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=e304fea0

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

---
 Documentation/package.unmask/kde-3.5               |    2 +
 net-dns/avahi/ChangeLog                            |   12 +++-
 ...{avahi-0.6.30.ebuild => avahi-0.6.30-r1.ebuild} |   67 +++++++++-------
 net-dns/avahi/avahi-0.6.30.ebuild                  |   12 ++--
 .../files/avahi-0.6.30-optional-gtk-utils.patch    |   83 ++++++++++++++++++++
 net-dns/avahi/metadata.xml                         |    6 ++
 6 files changed, 147 insertions(+), 35 deletions(-)

diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index 6c60753..820dfa4 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -61,6 +61,7 @@
 =app-pda/libopensync-plugin-kdepim-9999
 =app-portage/kelogviewer-0.4.0.7-r1
 =app-portage/kuroo-0.82.0
+=app-portage/kuroo-0.82.1
 =app-text/kbarcode-2.0.6
 =app-text/kbarcode-2.0.7
 =app-text/kchmviewer-3.1_p2-r1
@@ -614,6 +615,7 @@
 =net-dns/avahi-0.6.28-r1
 =net-dns/avahi-0.6.29
 =net-dns/avahi-0.6.30
+=net-dns/avahi-0.6.30-r1
 =net-firewall/knetfilter-3.5.0
 =net-im/kmess-1.5.1
 =net-im/kmess-1.5.2

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index b188d09..19c255d 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.203 2011/04/06 20:09:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.205 2011/08/14 12:52:06 nirbheek Exp $
+
+*avahi-0.6.30-r1 (14 Aug 2011)
+
+  14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +avahi-0.6.30-r1.ebuild,
+  +files/avahi-0.6.30-optional-gtk-utils.patch:
+  Add gtk3 and introspection support, make utilities optional, reorder deps to
+  use COMMON_DEPEND, remove static libraries and .la files
+
+  06 Aug 2011; Zac Medico <zmedico@gentoo.org> avahi-0.6.30.ebuild:
+  Fix for prefix and add ~x86-linux keyword.
 
 *avahi-0.6.30 (06 Apr 2011)
 

diff --git a/net-dns/avahi/avahi-0.6.30.ebuild b/net-dns/avahi/avahi-0.6.30-r1.ebuild
similarity index 72%
copy from net-dns/avahi/avahi-0.6.30.ebuild
copy to net-dns/avahi/avahi-0.6.30-r1.ebuild
index 1d1d3c7..d064fe0 100644
--- a/net-dns/avahi/avahi-0.6.30.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.30.ebuild,v 1.1 2011/04/06 20:09:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.1 2011/08/14 12:52:06 nirbheek Exp $
 
 EAPI="3"
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="python? 2"
 PYTHON_USE_WITH="gdbm"
 PYTHON_USE_WITH_OPT="python"
 
-inherit eutils mono python multilib flag-o-matic
+inherit autotools eutils mono python multilib flag-o-matic
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -16,19 +16,20 @@ 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 "
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~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"
 
 DBUS_DEPEND=">=sys-apps/dbus-0.30"
-RDEPEND=">=dev-libs/libdaemon-0.14
+COMMON_DEPEND=">=dev-libs/libdaemon-0.14
 	dev-libs/expat
-	>=dev-libs/glib-2
+	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
 	qt3? ( x11-libs/qt-meta:3 )
 	qt4? ( x11-libs/qt-core:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.14.0:2
-	)
+	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	dbus? (
 		${DBUS_DEPEND}
 		python? ( dev-python/dbus-python )
@@ -37,14 +38,9 @@ RDEPEND=">=dev-libs/libdaemon-0.14
 		>=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}
-	)
+	howl-compat? ( ${DBUS_DEPEND} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	mdnsresponder-compat? ( ${DBUS_DEPEND} )
 	python? (
 		gtk? ( >=dev-python/pygtk-2 )
 	)
@@ -53,13 +49,16 @@ RDEPEND=">=dev-libs/libdaemon-0.14
 		dev-python/twisted-web
 	)
 	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.5
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen
 		mono? ( >=virtual/monodoc-1.1.8 )
 	)"
+RDEPEND="${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
 
 pkg_setup() {
 	if use python; then
@@ -70,6 +69,11 @@ pkg_setup() {
 	if use python && ! use dbus && ! use gtk; then
 		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
 	fi
+
+	# FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
+	if use utils && ! { use gtk || use gtk3; }; then
+		ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
+	fi
 }
 
 pkg_preinst() {
@@ -93,12 +97,17 @@ 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"
+
+	eautoreconf
 }
 
 src_configure() {
 	use sh && replace-flags -O? -O0
 
-	local myconf=""
+	local myconf="--disable-static"
 
 	if use python; then
 		myconf+="
@@ -119,18 +128,15 @@ src_configure() {
 	# 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 \
+		--localstatedir="${EPREFIX}/var" \
 		--with-distro=gentoo \
 		--disable-python-dbus \
 		--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,8 +145,10 @@ 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) \
@@ -156,10 +164,10 @@ src_compile() {
 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
+		rm -f "${ED}"/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
+	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
+	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
@@ -176,6 +184,9 @@ src_install() {
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f {} + || die
 }
 
 pkg_postrm() {

diff --git a/net-dns/avahi/avahi-0.6.30.ebuild b/net-dns/avahi/avahi-0.6.30.ebuild
index 1d1d3c7..b2a28c4 100644
--- a/net-dns/avahi/avahi-0.6.30.ebuild
+++ b/net-dns/avahi/avahi-0.6.30.ebuild
@@ -1,6 +1,6 @@
 # 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.30.ebuild,v 1.1 2011/04/06 20:09:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30.ebuild,v 1.2 2011/08/06 09:41:21 zmedico Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ 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"
+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"
@@ -123,7 +123,7 @@ src_configure() {
 	# >=gobject-introspection-0.9, so we disable introspection for now.
 	# http://avahi.org/ticket/318
 	econf \
-		--localstatedir=/var \
+		--localstatedir="${EPREFIX}/var" \
 		--with-distro=gentoo \
 		--disable-python-dbus \
 		--disable-pygtk \
@@ -156,10 +156,10 @@ src_compile() {
 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
+		rm -f "${ED}"/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
+	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
+	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

diff --git a/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch b/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch
new file mode 100644
index 0000000..2c615a2
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch
@@ -0,0 +1,83 @@
+--- avahi-discover-standalone/Makefile.am
++++ avahi-discover-standalone/Makefile.am
+@@ -23,7 +23,7 @@
+ # This cool debug trap works on i386/gcc only
+ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+ 
+-if HAVE_GTK2OR3
++if ENABLE_GTK_UTILS
+ if HAVE_GLIB
+ bin_PROGRAMS = \
+ 	avahi-discover-standalone
+--- avahi-ui/Makefile.am
++++ avahi-ui/Makefile.am
+@@ -76,6 +76,7 @@
+ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+ endif
+ 
++if ENABLE_GTK_UTILS
+ bin_PROGRAMS = bssh
+ desktop_DATA += bssh.desktop bvnc.desktop
+ @INTLTOOL_DESKTOP_RULE@
+@@ -102,6 +103,7 @@
+ bvnc.desktop.in: bvnc.desktop.in.in
+ 	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
+ 
++endif # ENABLE_GTK_UTILS
+ endif # HAVE_GLIB
+ endif
+ endif
+--- configure.ac
++++ configure.ac
+@@ -564,7 +564,29 @@
+ fi
+ AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
+ 
+-AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" )
++#
++# Check for GTK+ Utils
++#
++AC_ARG_ENABLE(gtk-utils,
++        AS_HELP_STRING([--disable-gtk-utils],[Disable GTK+ utilities]),
++        [case "${enableval}" in
++                yes) WANT_GTK_UTILS=yes ;;
++                no)  WANT_GTK_UTILS=no ;;
++                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk-utils) ;;
++        esac],
++        [WANT_GTK_UTILS=yes])
++
++ENABLE_GTK_UTILS=no
++HAVE_GTK2OR3=no
++if test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
++	HAVE_GTK2OR3=yes
++	if test "x$WANT_GTK_UTILS" = "xyes"; then
++		ENABLE_GTK_UTILS=yes
++	fi
++fi
++
++AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK2OR3" = "xyes")
++AM_CONDITIONAL(ENABLE_GTK_UTILS, test "x$ENABLE_GTK_UTILS" = "xyes")
+ 
+ #
+ # D-Bus
+@@ -1199,11 +1221,6 @@
+    ENABLE_AUTOIPD="no   (You need libdaemon!)"
+ fi
+ 
+-HAVE_GTK2OR3=no
+-if test "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes" ; then
+-   HAVE_GTK2OR3=yes
+-fi
+-
+ BUILD_UI="no"
+ if test "x$HAVE_GTK2OR3" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then
+    BUILD_UI="yes"
+@@ -1223,7 +1240,7 @@
+     Building avahi-python:              ${BUILD_PYTHON}
+     Building libavahi-glib:             ${HAVE_GLIB}
+     Building libavahi-gobject:          ${BUILD_GOBJECT}
+-    Building avahi-discover-standalone: ${HAVE_GTK2OR3}
++    Building avahi-discover-standalone: ${ENABLE_GTK_UTILS}
+     Building libavahi-qt3:              ${HAVE_QT3}
+     Building libavahi-qt4:              ${HAVE_QT4}
+     Building avahi-sharp:               ${HAVE_MONO}

diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index d8e743d..6892e47 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -11,7 +11,13 @@
 	<flag name='bookmarks'>Install the avahi-bookmarks application (requires
 		<pkg>dev-python/twisted</pkg>)</flag>
 	<flag name='howl-compat'>Enable compat libraries for howl</flag>
+	<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
+		avahi utilities under USE=utils</flag>
+	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+		for introspection</flag>
 	<flag name='mdnsresponder-compat'>Enable compat libraries for
 		mDNSResponder</flag>
+	<flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and
+		bvnc</flag>
 </use>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-30 20:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-03  8:13 [gentoo-commits] proj/kde-sunset:master commit in: Documentation/package.unmask/, net-dns/avahi/, net-dns/avahi/files/ Martin von Gagern
  -- strict thread matches above, loose matches on Subject: below --
2011-03-19 11:53 Martin von Gagern
2011-08-30 20:50 Martin von Gagern

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox