Fix for systems where inotify is not available.

Package-Manager: portage-2.1.2.4

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index ef61add44fa4466c5cf8079e99278c12034bd3a5..7eae7e65ccc1a36abd8b06e36948085daae00c84 100644 (file)
--- 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.96 2007/04/21 16:47:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.97 2007/04/21 17:59:22 swegener Exp $
+
+  21 Apr 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.18-inotify-ifdef-fix.patch, avahi-0.6.18.ebuild:
+  Fix for systems where inotify is not available.
 
   21 Apr 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.18.ebuild:
   Workaround for ServiceTypeDatabase.py bug.

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index c6ede7f17e428e94c02ade3a9246bd66907c1025..b06f4b2d2fd2051d234d71f9b38b2d408a64ece6 100644 (file)
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -49,6 +49,10 @@ AUX avahi-0.6.16-svn-1374.patch 2259 RMD160 eeff239f51bf0bbd4c384f62dc3ca801c77e
 MD5 7f7e9a595cd772291c60860cacf05775 files/avahi-0.6.16-svn-1374.patch 2259
 RMD160 eeff239f51bf0bbd4c384f62dc3ca801c77e0687 files/avahi-0.6.16-svn-1374.patch 2259
 SHA256 227b4efcdc2120fd2637c4987198907b47f17d3db816760159ce506a62a4a74f files/avahi-0.6.16-svn-1374.patch 2259
+AUX avahi-0.6.18-inotify-ifdef-fix.patch 455 RMD160 abc10c1cd74192f545e43fd6a0cfcc8002515a0d SHA1 33436385957fe27a8446c850b77cbdb9e37661d7 SHA256 165a156b28e0c7b4784138ebdc0ebffd7c47a675320f74323345545633e04710
+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
 DIST avahi-0.6.15.tar.gz 892455 RMD160 c288d193f96751283065c4002d50ee139586e8b0 SHA1 b6ad5c4be1b868b1d8ccb14370c82bb8f01f8236 SHA256 21dc28f464dbf158ad15dc5ee9d0bad78215ef5633086e55b7201294d5841da0
 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
@@ -65,14 +69,14 @@ EBUILD avahi-0.6.17.ebuild 4189 RMD160 83a4e58d7af7493651cec8cd43724961b32d1b4e
 MD5 1281506152bed09977cf6dcd8e0dd7d7 avahi-0.6.17.ebuild 4189
 RMD160 83a4e58d7af7493651cec8cd43724961b32d1b4e avahi-0.6.17.ebuild 4189
 SHA256 80ad1bd0d5bd093a3374243e3bfb0fa0a1d54e28105faa0852d19436c74797fd avahi-0.6.17.ebuild 4189
-EBUILD avahi-0.6.18.ebuild 4231 RMD160 a24403854b66d3ed4a2c4d18e7b2893cdf45dd87 SHA1 dcda391f77e3c427ea99fe9af5367b2ed2db03c2 SHA256 5c74d89cbc034419d8c9c631a308f8a3bb09339c998c58174f4bcb0b280c86d1
-MD5 e3a37a58851f0946b937eee6a7c40330 avahi-0.6.18.ebuild 4231
-RMD160 a24403854b66d3ed4a2c4d18e7b2893cdf45dd87 avahi-0.6.18.ebuild 4231
-SHA256 5c74d89cbc034419d8c9c631a308f8a3bb09339c998c58174f4bcb0b280c86d1 avahi-0.6.18.ebuild 4231
-MISC ChangeLog 12960 RMD160 0a77f883f1bbfef941861e59a04cdec2d13d4769 SHA1 c6698fc1edab6b0a2dfde20eaafcbac6a36feaa3 SHA256 b9188f356d96f422e3bff0e17d621a192f3808dd5d42cf2fd0aa5a499a778a1a
-MD5 248d1695a83563428cbd5f45ff073f64 ChangeLog 12960
-RMD160 0a77f883f1bbfef941861e59a04cdec2d13d4769 ChangeLog 12960
-SHA256 b9188f356d96f422e3bff0e17d621a192f3808dd5d42cf2fd0aa5a499a778a1a ChangeLog 12960
+EBUILD avahi-0.6.18.ebuild 4282 RMD160 6df951bbf2eebab7c339e6a76020ef3f9d00e0d8 SHA1 37a6c7c129662e6ca58a468315c91213fad4945c SHA256 1306b24b1521d449bf89a25223c1d1596039d7dab0e7cadbf7f6a445135ac15a
+MD5 f2b9ace93c4d5b21b13a7eb507a89079 avahi-0.6.18.ebuild 4282
+RMD160 6df951bbf2eebab7c339e6a76020ef3f9d00e0d8 avahi-0.6.18.ebuild 4282
+SHA256 1306b24b1521d449bf89a25223c1d1596039d7dab0e7cadbf7f6a445135ac15a avahi-0.6.18.ebuild 4282
+MISC ChangeLog 13129 RMD160 11172c9cec5a5ff63b903a1357c49fabd36bc260 SHA1 bdf61982715226f2e7f800c2ee04bd4ae99e66d6 SHA256 e38ee4b395f9ff021366f2ca4c268a9fe2c759289f5c70673b21f34eebc9489b
+MD5 1e5eada7a40e9743001936022b93b202 ChangeLog 13129
+RMD160 11172c9cec5a5ff63b903a1357c49fabd36bc260 ChangeLog 13129
+SHA256 e38ee4b395f9ff021366f2ca4c268a9fe2c759289f5c70673b21f34eebc9489b ChangeLog 13129
 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 11372c91a1b12a5b2930aa3fc3ff38c756c108f7a4a42bbef1e02636ef434e7a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGKkBBI1lqEGTUzyQRAtseAKCEjyoNplTx4cXAObQx0/tzpUdB/QCfeex7
-T5WDabRjJJNv/Bo1ym1NpnE=
-=l1TA
+iD8DBQFGKlEFI1lqEGTUzyQRAtdVAJ49XGk9b2qHhDwiIheYuWNC/qDragCgseXV
+7K0SB3r2whbqU6qCRwAAPNo=
+=dRYd
 -----END PGP SIGNATURE-----

diff --git a/net-dns/avahi/avahi-0.6.18.ebuild b/net-dns/avahi/avahi-0.6.18.ebuild
index 591250c747e1faf1f3f073cc34d6f1fbb78fc172..53ec75633e27d2905831b17134469ad8c8863246 100644 (file)
--- a/net-dns/avahi/avahi-0.6.18.ebuild
+++ b/net-dns/avahi/avahi-0.6.18.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.18.ebuild,v 1.3 2007/04/21 16:47:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.18.ebuild,v 1.4 2007/04/21 17:59:22 swegener Exp $
 
 inherit eutils mono python qt3 qt4
 
@@ -93,6 +93,7 @@ src_unpack() {
        cd "${S}"
 
        epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
+       epatch "${FILESDIR}"/${P}-inotify-ifdef-fix.patch
 
        rm -f avahi-python/avahi/ServiceTypeDatabase.py
 }

diff --git a/net-dns/avahi/files/avahi-0.6.18-inotify-ifdef-fix.patch b/net-dns/avahi/files/avahi-0.6.18-inotify-ifdef-fix.patch
new file mode 100644 (file)
index 0000000..7865455
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.18-inotify-ifdef-fix.patch
@@ -0,0 +1,18 @@
+Index: trunk/avahi-daemon/main.c
+===================================================================
+--- trunk/avahi-daemon/main.c  (revision 1450)
++++ trunk/avahi-daemon/main.c  (working copy)
+@@ -42,11 +42,13 @@
+ #include <sys/resource.h>
+ #include <sys/socket.h>
+ 
++#ifdef HAVE_INOTIFY
+ #ifdef HAVE_SYS_INOTIFY_H
+ #include <sys/inotify.h>
+ #else
+ #include "inotify-nosys.h"
+ #endif
++#endif
+ 
+ #include <libdaemon/dfork.h>
+ #include <libdaemon/dsignal.h>