Added patch to fix build when inotify is not enabled (from gamin CVS).

Package-Manager: portage-2.0.51.22

4 files changed, 58 insertions, 9 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 7d6a6b2650e6..ce83a5e49da1 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.30 2005/08/20 16:01:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.31 2005/08/21 10:28:40 flameeyes Exp $
+
+  21 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gamin-0.1.5-noinotify.patch, gamin-0.1.5.ebuild:
+  Added patch to fix build when inotify is not enabled (from gamin CVS).
 
 *gamin-0.1.5 (20 Aug 2005)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index b3392dc284f8..756184e57747 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 7fd0380f62e67f563b17068dfe4522e7 ChangeLog 5736
+MD5 56d0a147e3d52d29bdfac13e2f2a1952 gamin-0.1.5.ebuild 1929
 MD5 ae02647e4752424ec1c60c3f6925c9ed gamin-0.1.3.ebuild 1830
-MD5 994b2591ca8e1301ce52043306c94713 ChangeLog 5548
 MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
-MD5 bec8a6310f144fd3c15b9cd0a8699bbd gamin-0.1.5.ebuild 1829
+MD5 510d70d44de83d7822311077a39621c8 files/gamin-0.1.3-freebsd.patch 3857
 MD5 84f3255901e8fa0574b40df22ee54cea files/gamin-0.1.5-inotify-legacy-backend.patch 27609
+MD5 281a6a262337245c21884f5afdd616b3 files/gamin-0.1.3-inotify-legacy-backend.patch 27609
 MD5 65e3ff0dfeabee2182ee256c943f5b37 files/digest-gamin-0.1.3 63
+MD5 ac0a6ced64a702a7d8cc11cc3437687c files/gamin-0.1.5-noinotify.patch 1180
 MD5 20a4a3c7c4794dfac0d00d75ef58fb96 files/digest-gamin-0.1.5 63
-MD5 510d70d44de83d7822311077a39621c8 files/gamin-0.1.3-freebsd.patch 3857
-MD5 281a6a262337245c21884f5afdd616b3 files/gamin-0.1.3-inotify-legacy-backend.patch 27609
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDB1VD1ZcsMnZjRyIRAvBEAJ9xz6N6MQp2iW3NVsSItMENjPz5BQCeNTZN
-iVP7786UCKVnD49XvJXiddM=
-=mBlh
+iD8DBQFDCFd/j5H05b2HAEkRAkEUAKCeBXXU7aQX4xom+sUrLw+RSWRK/QCdGLx5
+z8/4FjCSSUoM7SYfY5IM/DQ=
+=UuFj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gamin/files/gamin-0.1.5-noinotify.patch b/app-admin/gamin/files/gamin-0.1.5-noinotify.patch
new file mode 100644
index 000000000000..8ef947aa4ab2
--- /dev/null
+++ b/app-admin/gamin/files/gamin-0.1.5-noinotify.patch
@@ -0,0 +1,42 @@
+diff -ur -x '*~' gamin-0.1.5/server/gam_server.c gamin-0.1.5-fbsd/server/gam_server.c
+--- gamin-0.1.5/server/gam_server.c	2005-08-09 20:30:12.000000000 +0200
++++ gamin-0.1.5-fbsd/server/gam_server.c	2005-08-21 12:21:49.000000000 +0200
+@@ -170,9 +170,11 @@
+ 	if (gam_exclude_check (path)) 
+ 	{
+ 		GAM_DEBUG(DEBUG_INFO, "g_a_s: %s excluded\n", path);
++#if ENABLE_INOTIFY
+ 		if (gam_inotify_is_running())
+ 			return gam_poll_add_subscription (sub);
+ 		else
++#endif
+ 			return gam_backend_add_subscription(sub);
+ 	} else {
+ 		gam_fs_mon_type type;
+@@ -211,9 +213,11 @@
+ 
+ 	if (gam_exclude_check (path)) 
+ 	{
++#if ENABLE_INOTIFY
+ 		if (gam_inotify_is_running())
+ 			return gam_poll_remove_subscription (sub);
+ 		else
++#endif
+ 			return gam_backend_remove_subscription(sub);
+ 	} else {
+ 		gam_fs_mon_type type;
+@@ -300,10 +304,13 @@
+ 
+     reqno = gam_subscription_get_reqno(sub);
+ 
++#if ENABLE_INOTIFY
+ 	if (gam_inotify_is_running())
+ 	{
+ 		gam_queue_event(conn, reqno, event, subpath, len);
+-	} else {
++	} else
++#endif
++	{
+ 		if (gam_send_event(conn, reqno, event, subpath, len) < 0) {
+ 		GAM_DEBUG(DEBUG_INFO, "Failed to send event to PID %d\n",
+ 			  gam_connection_get_pid(conn));
diff --git a/app-admin/gamin/gamin-0.1.5.ebuild b/app-admin/gamin/gamin-0.1.5.ebuild
index cd64dd740def..4d650b5d9fb5 100644
--- a/app-admin/gamin/gamin-0.1.5.ebuild
+++ b/app-admin/gamin/gamin-0.1.5.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.1.5.ebuild,v 1.1 2005/08/20 16:01:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.5.ebuild,v 1.2 2005/08/21 10:28:40 flameeyes Exp $
 
 inherit eutils libtool
 
@@ -30,6 +30,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.1.3-freebsd.patch
 	# Add support for legacy inotify interface
 	epatch ${FILESDIR}/${PN}-0.1.5-inotify-legacy-backend.patch
+	# Fix inotify requirement to build this version
+	epatch ${FILESDIR}/${PN}-0.1.5-noinotify.patch
 
 	# Needed by above 'legacy inotify' patch
 	aclocal || die "aclocal failed"