Fixing inotify 0.21 patch so that it works, bug 86705

(Portage version: 2.0.51.19)

5 files changed, 17 insertions, 10 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 615e0edf064c..c9b42370ef49 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/gamin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.19 2005/03/21 21:51:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.20 2005/04/02 22:49:57 dsd Exp $
+
+*gamin-0.0.26-r6 (02 Apr 2005)
+
+  02 Apr 2005; Daniel Drake <dsd@gentoo.org>
+  files/gamin-0.0.26-inotify_use_fd.patch, -gamin-0.0.26-r5.ebuild,
+  +gamin-0.0.26-r6.ebuild:
+  Fixing inotify 0.21 patch so that it works, bug 86705
 
 *gamin-0.0.26-r5 (21 Mar 2005)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 181fecc8d28d..06327f71d23d 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,14 +1,14 @@
 MD5 59d28e6a7eced2cd85355b76c6ae02b4 gamin-0.0.26.ebuild 1186
-MD5 53bae81158628c4344478bd60cf48dd8 gamin-0.0.26-r5.ebuild 1260
 MD5 e14b51caa6ba40b1982f36284c19f75b gamin-0.0.19.ebuild 833
 MD5 d56aae268087693c5b5fe3fc58cdae4c gamin-0.0.25.ebuild 1185
 MD5 1a12b6356c49807d6a034d775c96575f gamin-0.0.20.ebuild 828
+MD5 53bae81158628c4344478bd60cf48dd8 gamin-0.0.26-r6.ebuild 1260
 MD5 2695c38fbf4b4e11fe5d9c4d6f080ffc gamin-0.0.18.ebuild 889
-MD5 a92771d98b21d5dffb9b739c450ed3b1 ChangeLog 3720
+MD5 24e3aef0de01d22a4f7f52784947d99f ChangeLog 3949
 MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
 MD5 39ade60322eb86b40eca5ba38fd6d522 gamin-0.0.15.ebuild 842
-MD5 f37ab3721e3687f4ce0797dd6dac31d5 files/gamin-0.0.26-inotify_use_fd.patch 2739
-MD5 caf15e7329c9675dff66e7f65b424e79 files/digest-gamin-0.0.26-r5 64
+MD5 315c32e4751bc7d3bcfd88e03841a168 files/gamin-0.0.26-inotify_use_fd.patch 2759
+MD5 caf15e7329c9675dff66e7f65b424e79 files/digest-gamin-0.0.26-r6 64
 MD5 c576a2ec43ce151b5bc78b77e0f58c9a files/digest-gamin-0.0.15 64
 MD5 b183176dcfe9a0ad1609767f11cafc12 files/digest-gamin-0.0.18 64
 MD5 35d7d4d3208d674f62e4f2d7ef7d383f files/digest-gamin-0.0.19 64
diff --git a/app-admin/gamin/files/digest-gamin-0.0.26-r5 b/app-admin/gamin/files/digest-gamin-0.0.26-r6
index 804bee05dd70..804bee05dd70 100644
--- a/app-admin/gamin/files/digest-gamin-0.0.26-r5
+++ b/app-admin/gamin/files/digest-gamin-0.0.26-r6
diff --git a/app-admin/gamin/files/gamin-0.0.26-inotify_use_fd.patch b/app-admin/gamin/files/gamin-0.0.26-inotify_use_fd.patch
index b40ede6f1a01..20cd88e82b2e 100644
--- a/app-admin/gamin/files/gamin-0.0.26-inotify_use_fd.patch
+++ b/app-admin/gamin/files/gamin-0.0.26-inotify_use_fd.patch
@@ -12,19 +12,19 @@ diff -u -r1.13 gam_inotify.c
 -	iwr.name = g_strdup(path);
 -	iwr.mask = 0xffffffff; // all events
 +	{
-+	    int fd = open(path, O_RDONLY);
++	    int file_fd = open(path, O_RDONLY);
  
 -        wd = ioctl(fd, INOTIFY_WATCH, &iwr);
 -        g_free(iwr.name);
-+	    if (fd < 0) {
++	    if (file_fd < 0) {
 +		G_UNLOCK(inotify);
 +		return;
 +	    }
 +
-+	    iwr.fd = fd;
++	    iwr.fd = file_fd;
 +	    iwr.mask = 0xffffffff; // all events
 +	    wd = ioctl(fd, INOTIFY_WATCH, &iwr);
-+	    close (fd);
++	    close (file_fd);
 +	}
  
          if (wd < 0) {
diff --git a/app-admin/gamin/gamin-0.0.26-r5.ebuild b/app-admin/gamin/gamin-0.0.26-r6.ebuild
index 512ca0eaec44..7350ceb619f8 100644
--- a/app-admin/gamin/gamin-0.0.26-r5.ebuild
+++ b/app-admin/gamin/gamin-0.0.26-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.0.26-r5.ebuild,v 1.1 2005/03/21 21:51:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.0.26-r6.ebuild,v 1.1 2005/04/02 22:49:57 dsd Exp $
 
 inherit eutils