Fix building on uClibc systems with USE=-ipv6.

3 files changed, 28 insertions, 4 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 66b0fdc8423f..798ad9844f61 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.23 2006/01/01 12:07:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.24 2006/01/06 01:55:49 vapier Exp $
+
+  06 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/avahi-0.6.1-no-ipv6.patch, avahi-0.6.1-r1.ebuild:
+  Fix building on uClibc systems with USE=-ipv6.
 
 *avahi-0.6.1-r1 (01 Jan 2006)
 
diff --git a/net-dns/avahi/avahi-0.6.1-r1.ebuild b/net-dns/avahi/avahi-0.6.1-r1.ebuild
index 91ae9301295d..56a9acefad2f 100644
--- a/net-dns/avahi/avahi-0.6.1-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.1-r1.ebuild,v 1.1 2006/01/01 12:07:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.1-r1.ebuild,v 1.2 2006/01/06 01:55:49 vapier Exp $
 
 inherit eutils qt3 mono python
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.freedesktop.org/~lennart/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sh ~sparc ~x86"
 IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt"
 
 RDEPEND=">=dev-libs/libdaemon-0.5
@@ -61,7 +61,7 @@ pkg_preinst() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
+	epatch "${FILESDIR}"/${P}-no-ipv6.patch
 	epatch "${FILESDIR}"/${PV}-dbus-0.60-support.patch
 	use dbus && epatch "${FILESDIR}"/${PV}-need-dbus-initscript.patch
 }
diff --git a/net-dns/avahi/files/avahi-0.6.1-no-ipv6.patch b/net-dns/avahi/files/avahi-0.6.1-no-ipv6.patch
new file mode 100644
index 000000000000..85d78207604a
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.1-no-ipv6.patch
@@ -0,0 +1,20 @@
+uClibc systems dont define IPV6_V6ONLY when USE=-ipv6
+
+--- avahi-core/socket.c
++++ avahi-core/socket.c
+@@ -360,6 +360,7 @@
+ }
+ 
+ int avahi_open_socket_ipv6(int no_reuse) {
++#ifdef IPV6_V6ONLY
+     struct sockaddr_in6 sa, local;
+     int fd = -1, yes, r;
+     int ttl;
+@@ -425,6 +426,7 @@
+ fail:
+     if (fd >= 0)
+         close(fd);
++#endif
+ 
+     return -1;
+ }