Sources is using wrong DEFINE to check if INotify should be enabled.

5 files changed, 109 insertions, 1 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index fac1874dd8c1..8470b1638421 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/gamin
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.2 2004/08/22 22:43:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.3 2004/08/24 17:21:43 azarah Exp $
+
+*gamin-0.0.6-r2 (24 Aug 2004)
+
+  24 Aug 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/gamin-0.0.6-actually-enable-inotify-support.patch,
+  +gamin-0.0.6-r2.ebuild:
+  Sources is using wrong DEFINE to check if INotify should be enabled.
 
 *gamin-0.0.6-r1 (23 Aug 2004)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 1517c4201545..e8e7d417b2ac 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -2,8 +2,11 @@ MD5 2cb122d18b95654da3d895d527036d49 ChangeLog 718
 MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
 MD5 b9cbe4aee62373ce44ff01b583afb639 gamin-0.0.6.ebuild 712
 MD5 ec1e6c4a5af7fb7ee2be409e61db46d2 gamin-0.0.6-r1.ebuild 1308
+MD5 15cd7e8614015ac161adb26ab8b9fdf7 gamin-0.0.6-r2.ebuild 1446
 MD5 59c722e7488d52801fe5b6df1cd6d48e files/digest-gamin-0.0.6 63
 MD5 14f8206ef4729b512f65d5f8d8b2da96 files/inotify-0.8.1.h 2465
 MD5 f52f7211e1d89b971993c4ad763b1dde files/gamin-0.0.6-inotify_h-include.patch 373
 MD5 beba31edee924b3c6c195cd2534cffd2 files/gamin-0.0.6-runtime-backend-select.patch 2940
 MD5 59c722e7488d52801fe5b6df1cd6d48e files/digest-gamin-0.0.6-r1 63
+MD5 916932a4819a028266c0d19797155ea0 files/gamin-0.0.6-actually-enable-inotify-support.patch 982
+MD5 59c722e7488d52801fe5b6df1cd6d48e files/digest-gamin-0.0.6-r2 63
diff --git a/app-admin/gamin/files/digest-gamin-0.0.6-r2 b/app-admin/gamin/files/digest-gamin-0.0.6-r2
new file mode 100644
index 000000000000..8254b2729611
--- /dev/null
+++ b/app-admin/gamin/files/digest-gamin-0.0.6-r2
@@ -0,0 +1 @@
+MD5 8f8841ed896cd11a96ad2089ab7326b8 gamin-0.0.6.tar.gz 385972
diff --git a/app-admin/gamin/files/gamin-0.0.6-actually-enable-inotify-support.patch b/app-admin/gamin/files/gamin-0.0.6-actually-enable-inotify-support.patch
new file mode 100644
index 000000000000..12cb692aecb4
--- /dev/null
+++ b/app-admin/gamin/files/gamin-0.0.6-actually-enable-inotify-support.patch
@@ -0,0 +1,38 @@
+--- gamin-0.0.6/server/gam_server.c	2004-08-24 19:20:13.397795664 +0200
++++ gamin-0.0.6.az/server/gam_server.c	2004-08-24 19:20:23.935193736 +0200
+@@ -33,7 +33,7 @@
+ #include "gam_channel.h"
+ #include "gam_subscription.h"
+ #include "gam_poll.h"
+-#ifdef USE_INOTIFY
++#ifdef ENABLE_INOTIFY
+ #include "gam_inotify.h"
+ #endif
+ #ifdef linux
+@@ -68,7 +68,7 @@
+ 
+     gam_backend = 0;
+ 
+-#ifdef USE_INOTIFY
++#ifdef ENABLE_INOTIFY
+     if ((!gam_backend) && (ret = gam_inotify_init())) {
+ 	gam_backend = BACKEND_INOTIFY;
+ 	gam_debug(DEBUG_INFO, "Using INotify as backend\n");
+@@ -138,7 +138,7 @@
+     }
+  ***/
+     switch (gam_backend) {
+-#ifdef USE_INOTIFY
++#ifdef ENABLE_INOTIFY
+     case BACKEND_INOTIFY:
+ 	return (gam_inotify_add_subscription(sub));
+ 	break;
+@@ -165,7 +165,7 @@
+ gam_remove_subscription(GamSubscription * sub)
+ {
+     switch (gam_backend) {
+-#ifdef USE_INOTIFY
++#ifdef ENABLE_INOTIFY
+     case BACKEND_INOTIFY:
+ 	return (gam_inotify_remove_subscription(sub));
+ 	break;
diff --git a/app-admin/gamin/gamin-0.0.6-r2.ebuild b/app-admin/gamin/gamin-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..5804149dfced
--- /dev/null
+++ b/app-admin/gamin/gamin-0.0.6-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.0.6-r2.ebuild,v 1.1 2004/08/24 17:21:43 azarah Exp $
+
+inherit eutils
+
+INOTIFY_VER="0.8.1"
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
+SRC_URI="http://www.gnome.org/~veillard/gamin/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=
+
+DEPEND="virtual/libc
+	>=dev-libs/glib-2.0
+	!app-admin/fam"
+
+PROVIDE="virtual/fam"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/server
+	if [ -f "/usr/src/linux/include/linux/inotify.h" ]
+	then
+		cp /usr/src/linux/include/linux/inotify.h .
+	elif [ -f "/usr/include/linux/inotify.h" ]
+	then
+		cp /usr/include/linux/inotify.h .
+	else
+		cp "${FILESDIR}/inotify-${INOTIFY_VER}.h" inotify.h
+	fi
+
+	# Include our inotify.h
+	epatch ${FILESDIR}/${P}-inotify_h-include.patch
+	# Select the backend at runtime
+	epatch ${FILESDIR}/${P}-runtime-backend-select.patch
+	# Sources is using wrong DEFINE to check if INotify should be enabled ...
+	epatch ${FILESDIR}/${P}-actually-enable-inotify-support.patch
+}
+
+src_compile() {
+	econf --enable-inotify \
+		--enable-debug || die
+	# Enable debug for testing the runtime backend patch
+
+	# Currently not smp safe
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS COPYING ChangeLog Copyright README TODO
+}