Add a patch to fix bug #183607.

(Portage version: 2.1.3_rc5)

5 files changed, 48 insertions, 4 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 07645d2f5a8c..89423be5469a 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.111 2007/06/28 18:41:23 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.112 2007/06/29 18:18:41 swegener Exp $
+
+  29 Jun 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.19-ui-sharp-gtk.patch,
+  +files/avahi-0.6.20-ui-sharp-gtk.patch, avahi-0.6.19-r1.ebuild,
+  avahi-0.6.20.ebuild:
+  Add a patch to fix bug #183607.
 
   28 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   avahi-0.6.19-r1.ebuild:
diff --git a/net-dns/avahi/avahi-0.6.19-r1.ebuild b/net-dns/avahi/avahi-0.6.19-r1.ebuild
index 255896666a51..abec38fe2fc3 100644
--- a/net-dns/avahi/avahi-0.6.19-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r1.ebuild,v 1.6 2007/06/28 18:41:23 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r1.ebuild,v 1.7 2007/06/29 18:18:41 swegener Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -100,6 +100,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
 	epatch "${FILESDIR}"/${P}-ui-sharp-automake.patch
+	epatch "${FILESDIR}"/${P}-ui-sharp-gtk.patch
 	epatch "${FILESDIR}"/${P}-assert-security.patch
 
 	eautomake
diff --git a/net-dns/avahi/avahi-0.6.20.ebuild b/net-dns/avahi/avahi-0.6.20.ebuild
index e8fa30ca4942..1d9646cf1251 100644
--- a/net-dns/avahi/avahi-0.6.20.ebuild
+++ b/net-dns/avahi/avahi-0.6.20.ebuild
@@ -1,8 +1,10 @@
 # Copyright 2000-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20.ebuild,v 1.2 2007/06/24 22:13:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20.ebuild,v 1.3 2007/06/29 18:18:41 swegener Exp $
 
-inherit eutils mono python qt3 qt4
+WANT_AUTOMAKE="1.9"
+
+inherit eutils mono python qt3 qt4 autotools
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -97,6 +99,9 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
+	epatch "${FILESDIR}"/${P}-ui-sharp-gtk.patch
+
+	eautomake
 }
 
 src_compile() {
diff --git a/net-dns/avahi/files/avahi-0.6.19-ui-sharp-gtk.patch b/net-dns/avahi/files/avahi-0.6.19-ui-sharp-gtk.patch
new file mode 100644
index 000000000000..8f3d261e6262
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.19-ui-sharp-gtk.patch
@@ -0,0 +1,16 @@
+diff -Nur avahi-0.6.19.orig/avahi-ui-sharp/Makefile.am avahi-0.6.19/avahi-ui-sharp/Makefile.am
+--- avahi-0.6.19.orig/avahi-ui-sharp/Makefile.am	2007-06-29 17:46:50.068591000 +0000
++++ avahi-0.6.19/avahi-ui-sharp/Makefile.am	2007-06-29 17:48:32.023145178 +0000
+@@ -44,6 +44,7 @@
+ 
+ if HAVE_MONO
+ if HAVE_DBUS
++if HAVE_GTK
+ all: $(ASSEMBLY) $(ASSEMBLY).config zssh.exe
+ 
+ if HAVE_MONODOC
+@@ -68,3 +69,4 @@
+ 
+ endif
+ endif
++endif
diff --git a/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch b/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch
new file mode 100644
index 000000000000..9d6def5b8c80
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch
@@ -0,0 +1,16 @@
+diff -Nur avahi-0.6.20.orig/avahi-ui-sharp/Makefile.am avahi-0.6.20/avahi-ui-sharp/Makefile.am
+--- avahi-0.6.20.orig/avahi-ui-sharp/Makefile.am	2007-05-10 20:10:30.000000000 +0000
++++ avahi-0.6.20/avahi-ui-sharp/Makefile.am	2007-06-29 18:12:38.686167585 +0000
+@@ -44,6 +44,7 @@
+ 
+ if HAVE_MONO
+ if HAVE_DBUS
++if HAVE_GTK
+ all: $(ASSEMBLY) $(ASSEMBLY).config bssh.exe
+ 
+ if HAVE_MONODOC
+@@ -68,3 +69,4 @@
+ 
+ endif
+ endif
++endif