Add patch from upstream to fix avahi-ui-sharp building, bug #177879.

Package-Manager: portage-2.1.2.7

4 files changed, 46 insertions, 15 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index bb8ec80c9af9..2c6899ae1d74 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.102 2007/05/09 21:15:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.103 2007/05/10 20:10:48 swegener Exp $
+
+  10 May 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.19-ui-sharp-automake.patch, avahi-0.6.19.ebuild:
+  Add patch from upstream to fix avahi-ui-sharp building, bug #177879.
 
 *avahi-0.6.19 (09 May 2007)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 632de04696e5..7aa598d58c1c 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -49,6 +49,10 @@ AUX avahi-0.6.18-inotify-ifdef-fix.patch 455 RMD160 abc10c1cd74192f545e43fd6a0cf
 MD5 5e626d1ed9e0f9ec6d1fe4b586cf0eca files/avahi-0.6.18-inotify-ifdef-fix.patch 455
 RMD160 abc10c1cd74192f545e43fd6a0cfcc8002515a0d files/avahi-0.6.18-inotify-ifdef-fix.patch 455
 SHA256 165a156b28e0c7b4784138ebdc0ebffd7c47a675320f74323345545633e04710 files/avahi-0.6.18-inotify-ifdef-fix.patch 455
+AUX avahi-0.6.19-ui-sharp-automake.patch 654 RMD160 a55092fc273e7d01a92609219a3ba30dcd2770e9 SHA1 9c0a7a1fc7691181d73375e4380d0aa19830ca72 SHA256 4c1ef7b47639072151af0d745eedd34a6396ad2cb904ad4ad4f4cde482457b92
+MD5 5c378a5f054a7933f920735348ea0c1e files/avahi-0.6.19-ui-sharp-automake.patch 654
+RMD160 a55092fc273e7d01a92609219a3ba30dcd2770e9 files/avahi-0.6.19-ui-sharp-automake.patch 654
+SHA256 4c1ef7b47639072151af0d745eedd34a6396ad2cb904ad4ad4f4cde482457b92 files/avahi-0.6.19-ui-sharp-automake.patch 654
 DIST avahi-0.6.16.tar.gz 891970 RMD160 0106c3082867715052b416e3c761d8f052de00a0 SHA1 8e684d29a16f6fda3c6a0458299134124d64b5ae SHA256 794d4d1c485d4dc24659a25feb92706eb8bff4552333a1df83e856db123c36ce
 DIST avahi-0.6.17.tar.gz 927202 RMD160 cac51c09730e1faf10bf0e11f091be3fd5f138d8 SHA1 3f7d293b72ca1c5269fa4b1e68b453d8ec3ff8f9 SHA256 2cb6a15a9fff56c0d24f3a95b7f67c52436a88716e640c7f7afd48c9a5cbd740
 DIST avahi-0.6.18.tar.gz 961748 RMD160 687dd4d84e175916ec3555314721068d75ad8943 SHA1 cec71de1b8cd939e847972dfea33217999bf7cd0 SHA256 11a0270cdf1220943ce8f3a79b705c6de6e57d94a058ee2efa9592037b4a4274
@@ -65,14 +69,14 @@ EBUILD avahi-0.6.18.ebuild 4354 RMD160 bbeaa7cefe11ae2aa19e712f21fac8212c1506d5
 MD5 220de791ca2972e520da067e32b59185 avahi-0.6.18.ebuild 4354
 RMD160 bbeaa7cefe11ae2aa19e712f21fac8212c1506d5 avahi-0.6.18.ebuild 4354
 SHA256 49d2bd8f1ac447113c45f4ebb3d3f90d1acbc5b4f5a098682e5429d3d689d6e8 avahi-0.6.18.ebuild 4354
-EBUILD avahi-0.6.19.ebuild 4212 RMD160 372bcf77104dd5e2d9a66de489436c754c7bf8b4 SHA1 d72019ec2edfdb158095a780a6964725e2e83a6b SHA256 fa09225275c244e3f129ccd924369450dfa7175536108c47c7a603f8b27e7ba8
-MD5 e49459f1e00028d29394bba2c1497a2d avahi-0.6.19.ebuild 4212
-RMD160 372bcf77104dd5e2d9a66de489436c754c7bf8b4 avahi-0.6.19.ebuild 4212
-SHA256 fa09225275c244e3f129ccd924369450dfa7175536108c47c7a603f8b27e7ba8 avahi-0.6.19.ebuild 4212
-MISC ChangeLog 13805 RMD160 e8d3b660d1519686da420e9f5f0d6038c9811873 SHA1 0ba6b6fdf6741961f881fbcc3295d0215856bbdd SHA256 8d9d16cd105bc63c7dcc25a2df4c787f6dc94c50b4000d2dcb5da3ad8f4b8c1a
-MD5 707cf96e850d1bf90ef9c1a2bdb0b1ac ChangeLog 13805
-RMD160 e8d3b660d1519686da420e9f5f0d6038c9811873 ChangeLog 13805
-SHA256 8d9d16cd105bc63c7dcc25a2df4c787f6dc94c50b4000d2dcb5da3ad8f4b8c1a ChangeLog 13805
+EBUILD avahi-0.6.19.ebuild 4341 RMD160 dbe18302c82e3df6678ab27b83d2f58269b6e9f7 SHA1 ade80dacae649b9c2230c50787afe4b25bacb1f1 SHA256 ec6cbafd0214f379f9e325d151fddc8443f4d81483202990132197e0cd770713
+MD5 053317c7c606fcdee3f14dbe1723c694 avahi-0.6.19.ebuild 4341
+RMD160 dbe18302c82e3df6678ab27b83d2f58269b6e9f7 avahi-0.6.19.ebuild 4341
+SHA256 ec6cbafd0214f379f9e325d151fddc8443f4d81483202990132197e0cd770713 avahi-0.6.19.ebuild 4341
+MISC ChangeLog 13995 RMD160 bb7a4eabdb800e43065d57992bc0ae5eb850f51e SHA1 ed4335bd54ec90dd4bf3ac0c75644c8b69719eb4 SHA256 38caa2bc5282c4af8563a7156ddc074d6bc00401d7958a055d6637f1a308ddc3
+MD5 7abe0b3ec62913328fd2616bcceb1511 ChangeLog 13995
+RMD160 bb7a4eabdb800e43065d57992bc0ae5eb850f51e ChangeLog 13995
+SHA256 38caa2bc5282c4af8563a7156ddc074d6bc00401d7958a055d6637f1a308ddc3 ChangeLog 13995
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -92,7 +96,7 @@ SHA256 ea8928681ddbe0fe704197076ec00c506b7a138c1510c373671297fcdbaef20d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGQjnuI1lqEGTUzyQRAsC4AKCRllTKiEXnvzJbdmQN5kLj4cPnKQCbB7hf
-T/rEKo2IKM2jiHTwjn/tduk=
-=rnKV
+iD8DBQFGQ3xQI1lqEGTUzyQRAi/lAKDLruBIlyjN50bavzhFIBI5Sh8aZACfWHU5
+ePzHlm1vu8KR/6fpPcBJOlk=
+=syjJ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.19.ebuild b/net-dns/avahi/avahi-0.6.19.ebuild
index 5742182d0222..e54de9453de2 100644
--- a/net-dns/avahi/avahi-0.6.19.ebuild
+++ b/net-dns/avahi/avahi-0.6.19.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.19.ebuild,v 1.1 2007/05/09 21:15:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19.ebuild,v 1.2 2007/05/10 20:10:48 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/"
@@ -35,7 +37,10 @@ RDEPEND=">=dev-libs/libdaemon-0.5
 			)
 		)
 	)
-	mono? ( >=dev-lang/mono-1.1.10 )
+	mono? (
+		>=dev-lang/mono-1.1.10
+		gtk? ( dev-dotnet/gtk-sharp )
+	)
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
 	python? (
@@ -94,6 +99,9 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
+	epatch "${FILESDIR}"/${P}-ui-sharp-automake.patch
+
+	eautomake
 }
 
 src_compile() {
diff --git a/net-dns/avahi/files/avahi-0.6.19-ui-sharp-automake.patch b/net-dns/avahi/files/avahi-0.6.19-ui-sharp-automake.patch
new file mode 100644
index 000000000000..a99cc2ed2a80
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.19-ui-sharp-automake.patch
@@ -0,0 +1,15 @@
+Index: trunk/avahi-ui-sharp/Makefile.am
+===================================================================
+--- trunk/avahi-ui-sharp/Makefile.am	(revision 1478)
++++ trunk/avahi-ui-sharp/Makefile.am	(revision 1480)
+@@ -39,8 +39,8 @@
+ $(ASSEMBLY).config: $(ASSEMBLY).config.in
+ 	$(srcdir)/gencfg.sh $(top_builddir)/avahi-common/libavahi-common.la < $< > $@
+ 
+-zssh.exe: $(srcdir)/zssh.cs
+-	mcs -out:$@ $^ -r:./avahi-ui-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix
++zssh.exe: $(srcdir)/zssh.cs $(ASSEMBLY)
++	mcs -out:$@ $(srcdir)/zssh.cs -r:./avahi-ui-sharp.dll -r:../avahi-sharp/avahi-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix
+ 
+ if HAVE_MONO
+ if HAVE_DBUS