Update version. Add a patch that does:

-  Use ENABLE_DNOTIFY (instead of #ifdef linux) in gam_server.c
  to include gam_dnotify.h and init the dnotify backend, else
  we get link errors if we build with inotify support, as
  gam_dnotify.o was not build
  (./configure --enable-inotify --disable-kernel).
-  Use '#ifdef HAVE_LINUX' instead of '#ifdef linux', as this
  is what is defined in config.h if we are building for linux.
  I might be wrong here, but I think 'linux' gets defined by
  gcc ...
-  Actually build dnotify backend again if --enable-inotify was
   passed, but not --disable-kernel.

5 files changed, 170 insertions, 7 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 2c18144dba70..993149f3e1c1 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,24 @@
 # 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.9 2004/09/16 21:02:13 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.10 2004/09/21 20:35:57 azarah Exp $
+
+*gamin-0.0.10 (21 Sep 2004)
+
+  21 Sep 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/gamin-0.0.10-HAVE_LINUX-and-ENABLE_DNOTIFY-cleanup.patch,
+  +gamin-0.0.10.ebuild:
+  Update version.  Add a patch that does:
+  -  Use ENABLE_DNOTIFY (instead of #ifdef linux) in gam_server.c
+    to include gam_dnotify.h and init the dnotify backend, else
+    we get link errors if we build with inotify support, as
+    gam_dnotify.o was not build
+    (./configure --enable-inotify --disable-kernel).
+  -  Use '#ifdef HAVE_LINUX' instead of '#ifdef linux', as this
+    is what is defined in config.h if we are building for linux.
+    I might be wrong here, but I think 'linux' gets defined by
+    gcc ...
+  -  Actually build dnotify backend again if --enable-inotify was
+     passed, but not --disable-kernel.
 
 *gamin-0.0.9 (16 Sep 2004)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index d113f5cde157..dd82e70e2999 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,13 +1,16 @@
-MD5 43acb163253fa5a7d486cd2449b0a516 ChangeLog 1564
-MD5 cb79cb3e2161998a010168013b4f171e gamin-0.0.9.ebuild 1363
+MD5 da51da5cf0d7d51aa2b38759303f30ab ChangeLog 2364
 MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
+MD5 1c22bd93f44fab7256bda5b284b1f659 gamin-0.0.10.ebuild 1720
 MD5 ee8fb13c688cd2cb69e8d8a998ca35c5 gamin-0.0.7.ebuild 1601
 MD5 ea62db6d3e1fc7819b705ecf31eab839 gamin-0.0.6-r2.ebuild 1572
-MD5 f03dcd8a601bc5e7f317e7d577887092 files/digest-gamin-0.0.7 63
-MD5 04840f528be2adbf8aeddefd3ef54f53 files/digest-gamin-0.0.9 63
+MD5 cb79cb3e2161998a010168013b4f171e gamin-0.0.9.ebuild 1363
+MD5 4e18889d5ef1bba7a3dc94859b535222 files/digest-gamin-0.0.10 64
+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 14f8206ef4729b512f65d5f8d8b2da96 files/inotify-0.8.1.h 2465
-MD5 59c722e7488d52801fe5b6df1cd6d48e files/digest-gamin-0.0.6-r2 63
+MD5 04840f528be2adbf8aeddefd3ef54f53 files/digest-gamin-0.0.9 63
 MD5 916932a4819a028266c0d19797155ea0 files/gamin-0.0.6-actually-enable-inotify-support.patch 982
+MD5 59c722e7488d52801fe5b6df1cd6d48e files/digest-gamin-0.0.6-r2 63
 MD5 0baa39ba6612747a9d91e2f18dc6c6f9 files/gamin-0.0.6-quiet-inotify-warning.patch 382
+MD5 f03dcd8a601bc5e7f317e7d577887092 files/digest-gamin-0.0.7 63
+MD5 fc9e2f75e4d730775c5bb42e53fb6666 files/gamin-0.0.10-HAVE_LINUX-and-ENABLE_DNOTIFY-cleanup.patch 2448
diff --git a/app-admin/gamin/files/digest-gamin-0.0.10 b/app-admin/gamin/files/digest-gamin-0.0.10
new file mode 100644
index 000000000000..30c6efc4d7a4
--- /dev/null
+++ b/app-admin/gamin/files/digest-gamin-0.0.10
@@ -0,0 +1 @@
+MD5 8b89a8aa3250abf6657c9967d61296bc gamin-0.0.10.tar.gz 413147
diff --git a/app-admin/gamin/files/gamin-0.0.10-HAVE_LINUX-and-ENABLE_DNOTIFY-cleanup.patch b/app-admin/gamin/files/gamin-0.0.10-HAVE_LINUX-and-ENABLE_DNOTIFY-cleanup.patch
new file mode 100644
index 000000000000..dd328561d063
--- /dev/null
+++ b/app-admin/gamin/files/gamin-0.0.10-HAVE_LINUX-and-ENABLE_DNOTIFY-cleanup.patch
@@ -0,0 +1,75 @@
+--- gamin-0.0.10/configure.in	2004-09-21 21:16:53.608085112 +0200
++++ gamin-0.0.10.az/configure.in	2004-09-21 21:49:59.739147296 +0200
+@@ -169,11 +169,19 @@ AM_CONDITIONAL(HAVE_LINUX, test x$os = x
+ 
+ if test x$os = xlinux-gnu; then
+ 	AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
++	
++	# We enable dnotify no matter what.  If the user enables
++	# inotify, he will still have dnotify to fall back on ...
++	AC_DEFINE(ENABLE_DNOTIFY,1,[Use dnotify as backend])
+ 	backend="dnotify"
+ else
+ 	backend="polling"
+ fi
+ 
++# We do not care about inotify for now - if the user enables
++# it, we still want to build dnotify support ...
++AM_CONDITIONAL(ENABLE_DNOTIFY, test x$backend = xdnotify)
++
+ AC_ARG_ENABLE(inotify,
+ [  --enable-inotify Uses inotify as backend],
+ [case "${enableval}" in
+@@ -184,17 +192,14 @@ esac])
+ 
+ if test x$backend = xinotify; then
+     AC_DEFINE(ENABLE_INOTIFY,1,[Use inotify as backend])
+-else 
+-    if test x$backend = xdnotify; then
+-        AC_DEFINE(ENABLE_DNOTIFY,1,[Use dnotify as backend])
+-        else if test x$backend = xpolling; then
+-            AC_DEFINE(ENABLE_POLLING,1,[Use polling as backend])
+-        fi
++else
++    # If all else fails, use polling
++    if test x$backend = xpolling; then
++        AC_DEFINE(ENABLE_POLLING,1,[Use polling as backend])
+     fi
+ fi
+ 
+ AM_CONDITIONAL(ENABLE_INOTIFY, test x$backend = xinotify)
+-AM_CONDITIONAL(ENABLE_DNOTIFY, test x$backend = xdnotify)
+ 
+ dnl check for flavours of varargs macros (test from GLib)
+ AC_MSG_CHECKING(for ISO C99 varargs macros in C)
+--- gamin-0.0.10/server/gam_excludes.c	2004-09-21 21:44:04.466157000 +0200
++++ gamin-0.0.10.az/server/gam_excludes.c	2004-09-21 21:48:36.589787920 +0200
+@@ -19,7 +19,7 @@ struct _gam_exclude {
+ static int initialized = 0;
+ static GList *excludes = NULL;
+ static char *static_excludes[] = {
+-#ifdef linux
++#ifdef HAVE_LINUX
+     "/media/*",
+     "/mnt/*",
+ #endif
+--- gamin-0.0.10/server/gam_server.c	2004-09-21 21:19:34.375644728 +0200
++++ gamin-0.0.10.az/server/gam_server.c	2004-09-21 21:31:33.929255952 +0200
+@@ -36,7 +36,7 @@
+ #ifdef ENABLE_INOTIFY
+ #include "gam_inotify.h"
+ #endif
+-#ifdef linux
++#ifdef ENABLE_DNOTIFY
+ #include "gam_dnotify.h"
+ #endif
+ #include "gam_excludes.h"
+@@ -72,7 +72,7 @@ gam_init_subscriptions(void)
+ 	return(TRUE);
+     }
+ #endif
+-#ifdef linux
++#ifdef ENABLE_DNOTIFY
+     if (gam_dnotify_init()) {
+ 	gam_debug(DEBUG_INFO, "Using DNotify as backend\n");
+ 	return(TRUE);
diff --git a/app-admin/gamin/gamin-0.0.10.ebuild b/app-admin/gamin/gamin-0.0.10.ebuild
new file mode 100644
index 000000000000..d97f56645c5c
--- /dev/null
+++ b/app-admin/gamin/gamin-0.0.10.ebuild
@@ -0,0 +1,66 @@
+# 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.10.ebuild,v 1.1 2004/09/21 20:35:57 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 ~ppc"
+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
+
+	cd ${S}
+
+	# Include our inotify.h
+	epatch ${FILESDIR}/${PN}-0.0.6-inotify_h-include.patch
+	# Only complain about failing to open inotify node if debug is enabled.
+	epatch ${FILESDIR}/${PN}-0.0.6-quiet-inotify-warning.patch
+	# Cleanup HAVE_LINUX and ENABLE_DNOTIFY usage.  This also allow the
+	# DNotify backend to build again if inotify is enabled, as well as
+	# fix a build error.
+	epatch ${FILESDIR}/${PN}-0.0.10-HAVE_LINUX-and-ENABLE_DNOTIFY-cleanup.patch
+
+	einfo "Running autoreconf (can take a minute or two)..."
+	autoreconf &>/dev/null || die "autreconf failed!"
+}
+
+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
+}