Add patch to support >=app-misc/beagle-0.3.0 (bug #231979) and add me to the list of maintainers

(Portage version: 2.2_rc2/cvs/Linux 2.6.26 i686)

4 files changed, 50 insertions, 4 deletions

diff --git a/sys-fs/beaglefs/ChangeLog b/sys-fs/beaglefs/ChangeLog
index d056440c9685..fa3a8867ddee 100644
--- a/sys-fs/beaglefs/ChangeLog
+++ b/sys-fs/beaglefs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/beaglefs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/ChangeLog,v 1.4 2008/07/07 20:26:22 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/ChangeLog,v 1.5 2008/07/25 07:43:32 ford_prefect Exp $
+
+  25 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org>
+  +files/beaglefs-1.0.3-libbeagle-0.3.patch, metadata.xml,
+  beaglefs-1.0.3.ebuild:
+  Add patch to support >=app-misc/beagle-0.3.0 (bug #231979) and add me to
+  the list of maintainers
 
   07 Jul 2008; Cédric Krier <cedk@gentoo.org> beaglefs-1.0.3.ebuild:
   Fix einfo for bug #207798
diff --git a/sys-fs/beaglefs/beaglefs-1.0.3.ebuild b/sys-fs/beaglefs/beaglefs-1.0.3.ebuild
index 62597b3be608..ca53134a2d6b 100644
--- a/sys-fs/beaglefs/beaglefs-1.0.3.ebuild
+++ b/sys-fs/beaglefs/beaglefs-1.0.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/beaglefs-1.0.3.ebuild,v 1.2 2008/07/07 20:26:22 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/beaglefs/beaglefs-1.0.3.ebuild,v 1.3 2008/07/25 07:43:32 ford_prefect Exp $
+
+inherit eutils
 
 DESCRIPTION="beaglefs implements a filesystem representing a live Beagle query."
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rml/fuse/beaglefs/"
@@ -13,10 +15,17 @@ IUSE=""
 
 DEPEND=">=app-misc/beagle-0.2
 	>=sys-fs/fuse-2.5"
-RDEPEND=""
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	if has_version dev-libs/libbeagle; then
+		epatch "${FILESDIR}/${P}-libbeagle-0.3.patch"
+	fi
+}
 
 src_compile() {
-	emake
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/sys-fs/beaglefs/files/beaglefs-1.0.3-libbeagle-0.3.patch b/sys-fs/beaglefs/files/beaglefs-1.0.3-libbeagle-0.3.patch
new file mode 100644
index 000000000000..7dd82072626e
--- /dev/null
+++ b/sys-fs/beaglefs/files/beaglefs-1.0.3-libbeagle-0.3.patch
@@ -0,0 +1,27 @@
+diff -urN beaglefs-1.0.3.orig/hit.c beaglefs-1.0.3/hit.c
+--- beaglefs-1.0.3.orig/hit.c	2008-07-17 16:22:45.000000000 +0530
++++ beaglefs-1.0.3/hit.c	2008-07-17 16:30:08.000000000 +0530
+@@ -121,8 +121,7 @@
+ 	request = BEAGLE_REQUEST (query);
+ 
+ 	beagle_query_add_text (query, query_text);
+-	beagle_query_add_hit_type (query, "File");
+-	beagle_query_add_hit_type (query, "IMLog");
++	beagle_query_add_text (query, "type:File OR type:IMLog");
+ 
+ 	g_signal_connect (query,
+ 			  "hits-added",
+diff -urN beaglefs-1.0.3.orig/Makefile beaglefs-1.0.3/Makefile
+--- beaglefs-1.0.3.orig/Makefile	2008-07-17 16:22:45.000000000 +0530
++++ beaglefs-1.0.3/Makefile	2008-07-17 16:22:59.000000000 +0530
+@@ -13,8 +13,8 @@
+ FUSE_CFLAGS ?= `pkg-config --cflags fuse`
+ FUSE_LIBS ?= `pkg-config --libs fuse`
+ 
+-BEAGLE_CFLAGS ?= `pkg-config --cflags libbeagle-0.0`
+-BEAGLE_LIBS ?= `pkg-config --libs libbeagle-0.0`
++BEAGLE_CFLAGS ?= `pkg-config --cflags libbeagle-1.0`
++BEAGLE_LIBS ?= `pkg-config --libs libbeagle-1.0`
+ 
+ GTHREAD_CFLAGS ?= `pkg-config --cflags gthread-2.0`
+ GTHREAD_LIBS ?= `pkg-config --libs gthread-2.0`
diff --git a/sys-fs/beaglefs/metadata.xml b/sys-fs/beaglefs/metadata.xml
index 39fff95ba83b..23c9e9ca4d7b 100644
--- a/sys-fs/beaglefs/metadata.xml
+++ b/sys-fs/beaglefs/metadata.xml
@@ -6,4 +6,8 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
+	<maintainer>
+		<email>ford_prefect@gentoo.org</email>
+		<name>Arun Raghavan</name>
+	</maintainer>
 </pkgmetadata>