Add a patch to fix bug #183607.

Package-Manager: portage-2.1.3_rc5

6 files changed, 78 insertions, 16 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/Manifest b/net-dns/avahi/Manifest
index 27cea3eaffda..e5e976499c69 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 MD5 873dca478a6a7bd3931f462becade245 files/autoipd.sh 1271
 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 files/autoipd.sh 1271
@@ -54,6 +57,14 @@ AUX avahi-0.6.19-ui-sharp-automake.patch 654 RMD160 a55092fc273e7d01a92609219a3b
 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
+AUX avahi-0.6.19-ui-sharp-gtk.patch 427 RMD160 967c446b0204baa4ddf5a0568164352caa90cfaa SHA1 6261c6ed45f5a5651ed5464c60777f21e4a482de SHA256 ae4ae6a21ebfcf39f3f1f9bf67cc5f47881d4e28cfb6f488517819806909ee9c
+MD5 1918bb632bd1476837dbeee789b7d310 files/avahi-0.6.19-ui-sharp-gtk.patch 427
+RMD160 967c446b0204baa4ddf5a0568164352caa90cfaa files/avahi-0.6.19-ui-sharp-gtk.patch 427
+SHA256 ae4ae6a21ebfcf39f3f1f9bf67cc5f47881d4e28cfb6f488517819806909ee9c files/avahi-0.6.19-ui-sharp-gtk.patch 427
+AUX avahi-0.6.20-ui-sharp-gtk.patch 427 RMD160 d2459f3b30740bb6a97f47bfc1f709a1439e36d6 SHA1 8eeb7d17cfcb251840cb953cb61e0d107fa55c9d SHA256 cd3601df622a8445d50779fb73bb3deab3880fd66cd765d932155f51ac99491b
+MD5 02bb9381563447d6382b6a140e2ec463 files/avahi-0.6.20-ui-sharp-gtk.patch 427
+RMD160 d2459f3b30740bb6a97f47bfc1f709a1439e36d6 files/avahi-0.6.20-ui-sharp-gtk.patch 427
+SHA256 cd3601df622a8445d50779fb73bb3deab3880fd66cd765d932155f51ac99491b files/avahi-0.6.20-ui-sharp-gtk.patch 427
 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
@@ -71,22 +82,22 @@ EBUILD avahi-0.6.18.ebuild 4379 RMD160 bc5a4e4ad67210aa5d839fa93c35824cc1c8b4b7
 MD5 f963b9747fe0787a4a54c8df3aa1468d avahi-0.6.18.ebuild 4379
 RMD160 bc5a4e4ad67210aa5d839fa93c35824cc1c8b4b7 avahi-0.6.18.ebuild 4379
 SHA256 ddc54c7b174bec78fa035e5dc3741ebb62b1d3ace2209ab56e90b655fed1c1fa avahi-0.6.18.ebuild 4379
-EBUILD avahi-0.6.19-r1.ebuild 4413 RMD160 ef2b7eaa2798a98ee1eb3616e53038381fa1c80b SHA1 0f1fa1c737f4ae1bd9f586d95c1d7ff69f2c32b9 SHA256 70003ea40ba4720a2996ca2c58239773dc2cac6f0ae43f1d2f1418269c635991
-MD5 3f1327d5103c3dfb4e8d7bd28d1eed50 avahi-0.6.19-r1.ebuild 4413
-RMD160 ef2b7eaa2798a98ee1eb3616e53038381fa1c80b avahi-0.6.19-r1.ebuild 4413
-SHA256 70003ea40ba4720a2996ca2c58239773dc2cac6f0ae43f1d2f1418269c635991 avahi-0.6.19-r1.ebuild 4413
+EBUILD avahi-0.6.19-r1.ebuild 4457 RMD160 b67bf58b294258ca46d062c964030c26e14f9556 SHA1 2267b104248a5167bef8919f5816c1ca5d42a705 SHA256 d6a8d52fc10b187bc03d6d970653b48ef1313482b7eccddbdb5cb736f4e3d208
+MD5 d9ba5eac28788f48361da3edb46c7191 avahi-0.6.19-r1.ebuild 4457
+RMD160 b67bf58b294258ca46d062c964030c26e14f9556 avahi-0.6.19-r1.ebuild 4457
+SHA256 d6a8d52fc10b187bc03d6d970653b48ef1313482b7eccddbdb5cb736f4e3d208 avahi-0.6.19-r1.ebuild 4457
 EBUILD avahi-0.6.19.ebuild 4363 RMD160 88de205107a99409b9d7adbce96e7b9466659bf4 SHA1 95b4a8329e42d5adbec462646f782465b9735d9c SHA256 91e45ab233248eb38a4e77da7edfd419455c1196448a7fb045c607744a5a55cd
 MD5 f83dd71b9abca7300f83aee874ddecfd avahi-0.6.19.ebuild 4363
 RMD160 88de205107a99409b9d7adbce96e7b9466659bf4 avahi-0.6.19.ebuild 4363
 SHA256 91e45ab233248eb38a4e77da7edfd419455c1196448a7fb045c607744a5a55cd avahi-0.6.19.ebuild 4363
-EBUILD avahi-0.6.20.ebuild 4270 RMD160 9207d4f00a5842d78298b2651ba11428138f6632 SHA1 ce9702e19f332cb89d722a16df6351a86cba8069 SHA256 90f609a2e3e8c0273a587b042e9abb4d24534c5607284d39cb9d6ef90b765ae7
-MD5 1147b6700c5577d3174571b6a607080d avahi-0.6.20.ebuild 4270
-RMD160 9207d4f00a5842d78298b2651ba11428138f6632 avahi-0.6.20.ebuild 4270
-SHA256 90f609a2e3e8c0273a587b042e9abb4d24534c5607284d39cb9d6ef90b765ae7 avahi-0.6.20.ebuild 4270
-MISC ChangeLog 15280 RMD160 e3935af19c5e4fdd290abf915eef98180e7fbc20 SHA1 8a33eb65a0f4f6739d1542de468dcaeca2c692b0 SHA256 afc45088151d633d05d59781a6f453247dc9050a80a2b904a4f5770bb2c97c76
-MD5 826f20a16e2f7e59bc9e49294d64e625 ChangeLog 15280
-RMD160 e3935af19c5e4fdd290abf915eef98180e7fbc20 ChangeLog 15280
-SHA256 afc45088151d633d05d59781a6f453247dc9050a80a2b904a4f5770bb2c97c76 ChangeLog 15280
+EBUILD avahi-0.6.20.ebuild 4361 RMD160 07e7c8ef0c6251f6ad9539a1af2be7c859428144 SHA1 330d6bd365ec91e720dabd1e2799a3e9ade20059 SHA256 434266f3adb8d0244cfec6bed454cc02e2595f9ab6721004bbdc861b94246fa5
+MD5 c8a395d01b9af878650b23734d1e461e avahi-0.6.20.ebuild 4361
+RMD160 07e7c8ef0c6251f6ad9539a1af2be7c859428144 avahi-0.6.20.ebuild 4361
+SHA256 434266f3adb8d0244cfec6bed454cc02e2595f9ab6721004bbdc861b94246fa5 avahi-0.6.20.ebuild 4361
+MISC ChangeLog 15494 RMD160 e19c0369e5a7cb286562a89223d43d44f9e23dc9 SHA1 224a91a39cf6ea0da3612aff14e1fed0f8f6df5e SHA256 d7f89a6d20227b7148180994f8ba02ec4261a09e474fd06e87a3955bd32c4053
+MD5 980d72ee12cb855549e7926afcdc437e ChangeLog 15494
+RMD160 e19c0369e5a7cb286562a89223d43d44f9e23dc9 ChangeLog 15494
+SHA256 d7f89a6d20227b7148180994f8ba02ec4261a09e474fd06e87a3955bd32c4053 ChangeLog 15494
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -109,3 +120,10 @@ SHA256 ea8928681ddbe0fe704197076ec00c506b7a138c1510c373671297fcdbaef20d files/di
 MD5 abad0d13524e320d577cc47c71fbc9da files/digest-avahi-0.6.20 238
 RMD160 189115dd402bfa26b8bf8aa16ffd0879d8d147a5 files/digest-avahi-0.6.20 238
 SHA256 9dd3a566162032a532c8a8ce934135a8c99fd7abc07dfe010bfe606fa687785c files/digest-avahi-0.6.20 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGhU0KI1lqEGTUzyQRAstxAKCcde3zCy2Sx2BCgsqQizID9lfJtACfd+qi
+8UB5pju0nw5eV5cc8bMW5Oc=
+=4Ewt
+-----END PGP SIGNATURE-----
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