Fix bug 252647, thanks to Paul de Vrieze (pauldv@gentoo.org) for the patch.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 50 insertions, 22 deletions

diff --git a/dev-dotnet/mono-zeroconf/ChangeLog b/dev-dotnet/mono-zeroconf/ChangeLog
index 4355f6e319d7..8a32745ecbc7 100644
--- a/dev-dotnet/mono-zeroconf/ChangeLog
+++ b/dev-dotnet/mono-zeroconf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/mono-zeroconf
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono-zeroconf/ChangeLog,v 1.5 2008/11/24 00:13:14 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono-zeroconf/ChangeLog,v 1.6 2009/01/25 13:56:40 loki_val Exp $
+
+*mono-zeroconf-0.8.0-r1 (25 Jan 2009)
+
+  25 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/mono-zeroconf-0.8.0-mono-2.2.patch, -mono-zeroconf-0.8.0.ebuild,
+  +mono-zeroconf-0.8.0-r1.ebuild:
+  Fix bug 252647, thanks to Paul de Vrieze (pauldv@gentoo.org) for the
+  patch.
 
 *mono-zeroconf-0.8.0 (24 Nov 2008)
 
diff --git a/dev-dotnet/mono-zeroconf/Manifest b/dev-dotnet/mono-zeroconf/Manifest
index ad6aa24fde28..983ed4ff86fe 100644
--- a/dev-dotnet/mono-zeroconf/Manifest
+++ b/dev-dotnet/mono-zeroconf/Manifest
@@ -1,4 +1,5 @@
+AUX mono-zeroconf-0.8.0-mono-2.2.patch 1120 RMD160 6addc6a625e65cf2a28001a3b93438fd4bb0de29 SHA1 0b14f7aff0b4f4c8f57ce92a026bbd5349eaaa45 SHA256 0fc4ba758953117573597bce7ca185eb709e00fdbd2fd6aab0b05e09388a4b8e
 DIST mono-zeroconf-0.8.0.tar.bz2 138181 RMD160 725720e35788de7085afc984acd34767a6bf48e6 SHA1 0ba83248cc5afa24653c485fa92bcf6984533183 SHA256 ae6fee02ec0b17687e81a796e87b3fa6e641afa15a2f57c492267363b2b67a28
-EBUILD mono-zeroconf-0.8.0.ebuild 1141 RMD160 d1300bdf6e354163396e8f57cc7105d5e6a210da SHA1 ef74dee96506009fb13a6792d5097ab7d8669dc2 SHA256 a8141a714997f76cd0889c9c811667eaac280b77374f4439589991b6d1813d22
-MISC ChangeLog 983 RMD160 5f717b781cbe265c4300d0d5d096d28fa7c6f364 SHA1 a12895890e4c34d1102442a7befd72a582f5809e SHA256 47e72802ab088bc01e246ee2cb89eef68fb4132b6685742f1f3bcb40e9fcd768
+EBUILD mono-zeroconf-0.8.0-r1.ebuild 1044 RMD160 766425e01f48c265421b5fd15e6b04b8179a5a18 SHA1 e3ef17da9f7136d5cfb741d8051745e64453dbc2 SHA256 80c3f033fba5b25b9271e485bd5eeac0fab90c340c8941a4aca32bf5b5a62ed0
+MISC ChangeLog 1264 RMD160 02ab8abd056076ba61ce5352786e33e5e850e3ae SHA1 f47924dcd81aa60bb3b8d2e9e65efddbb3fcdfaa SHA256 d4886b770f3670564defc673c02ed03b8a0fdc44993866cc64df9735ce029e5a
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/dev-dotnet/mono-zeroconf/files/mono-zeroconf-0.8.0-mono-2.2.patch b/dev-dotnet/mono-zeroconf/files/mono-zeroconf-0.8.0-mono-2.2.patch
new file mode 100644
index 000000000000..777ff0134970
--- /dev/null
+++ b/dev-dotnet/mono-zeroconf/files/mono-zeroconf-0.8.0-mono-2.2.patch
@@ -0,0 +1,24 @@
+diff -urN mono-zeroconf-0.8.0.orig/src/Mono.Zeroconf.Providers.AvahiDBus/Mono.Zeroconf.Providers.AvahiDBus/Service.cs mono-zeroconf-0.8.0/src/Mono.Zeroconf.Providers.AvahiDBus/Mono.Zeroconf.Providers.AvahiDBus/Service.cs
+--- mono-zeroconf-0.8.0.orig/src/Mono.Zeroconf.Providers.AvahiDBus/Mono.Zeroconf.Providers.AvahiDBus/Service.cs	2008-06-27 00:45:12.000000000 +0200
++++ mono-zeroconf-0.8.0/src/Mono.Zeroconf.Providers.AvahiDBus/Mono.Zeroconf.Providers.AvahiDBus/Service.cs	2009-01-22 16:52:58.155891843 +0100
+@@ -65,17 +65,17 @@
+         
+         public string Name {
+             get { return name; }
+-            protected set { name = value; }
++            set { name = value; }
+         }
+         
+         public string RegType {
+             get { return regtype; }
+-            protected set { regtype = value; }
++            set { regtype = value; }
+         }
+         
+         public string ReplyDomain {
+             get { return reply_domain; }
+-            protected set { reply_domain = value; }
++            set { reply_domain = value; }
+         }
+         
+         public uint NetworkInterface {
diff --git a/dev-dotnet/mono-zeroconf/mono-zeroconf-0.8.0.ebuild b/dev-dotnet/mono-zeroconf/mono-zeroconf-0.8.0-r1.ebuild
index 80cccd78347f..a0cf1d4a34a6 100644
--- a/dev-dotnet/mono-zeroconf/mono-zeroconf-0.8.0.ebuild
+++ b/dev-dotnet/mono-zeroconf/mono-zeroconf-0.8.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono-zeroconf/mono-zeroconf-0.8.0.ebuild,v 1.1 2008/11/24 00:13:14 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono-zeroconf/mono-zeroconf-0.8.0-r1.ebuild,v 1.1 2009/01/25 13:56:40 loki_val Exp $
 
-EAPI=1
+EAPI=2
 
-inherit eutils mono
+inherit base mono
 
 DESCRIPTION="a cross platform Zero Configuration Networking library for Mono and .NET."
 HOMEPAGE="http://www.mono-project.com/Mono.Zeroconf"
@@ -13,31 +13,26 @@ SRC_URI="http://banshee-project.org/files/${PN}/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+avahi"
+IUSE="doc +avahi"
 
-RDEPEND=">=dev-lang/mono-1.1.10
-	avahi? ( >=net-dns/avahi-0.6 )
+RDEPEND=">=dev-lang/mono-2.0
+	avahi? ( >=net-dns/avahi-0.6[mono] )
 	!avahi? ( net-misc/mDNSResponder )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	local fail="Re-emerge net-dns/avahi with USE mono."
-	if use avahi && ! built_with_use net-dns/avahi mono; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
+PATCHES=( "${FILESDIR}/${P}-mono-2.2.patch" )
+
+src_configure() {
+	econf $(use_enable doc docs)$(use_enable avahi) $(use_enable !avahi mdnsresponder)
 }
 
 src_compile() {
-	local myconf
-	use avahi || myconf="--disable-avahi"
-	use avahi && myconf="--disable-mdnsresponder"
-	econf --disable-docs ${myconf}
 	emake -j1 || die "emake failed."
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
+	mono_multilib_comply
 }