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

Package-Manager: portage-2.2_rc2/cvs/Linux 2.6.26 i686

5 files changed, 54 insertions, 7 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/Manifest b/sys-fs/beaglefs/Manifest
index 665eab016350..2ebfcc341373 100644
--- a/sys-fs/beaglefs/Manifest
+++ b/sys-fs/beaglefs/Manifest
@@ -1,4 +1,5 @@
+AUX beaglefs-1.0.3-libbeagle-0.3.patch 1097 RMD160 3a61671ad75a0fb7a7c214293e8c9372d0b5c579 SHA1 816cef84fb39dfe96a962266b2f2f7c7429eb045 SHA256 dd2ac7ee3e2fab9e45289b4741e2ffc8872fb45bf9710840fb7309b4f6d663d7
 DIST beaglefs-1.0.3.tar.bz2 13170 RMD160 e72af129af606013bb5cf68b38da2f9a3a78da31 SHA1 c3b0eb667edf967be19ea806a34673733c39aee2 SHA256 2f7eff22ba178b1ee084caa081fed70257bf4debf0a29fb57d06c10f5f3c4b78
-EBUILD beaglefs-1.0.3.ebuild 782 RMD160 144cd0917a73ad1ecbe46e916b379cecb40357d3 SHA1 8d8fb82fc441c6e9ea36e1a8605d8fbd25726c30 SHA256 ab918e23e4db42a67b9d8a3f2c68d2cc14c4136b2afa8ab48a81586105b092eb
-MISC ChangeLog 651 RMD160 bd51ee12994bee7abf1ee0988326259d4157aba8 SHA1 47fd65b94a565d32688de3bf55ca6075661be644 SHA256 8c3cf3ccedbd22ff350f62ad8eeb2b81e169f2436bed3251013e925d02bf5119
-MISC metadata.xml 252 RMD160 42d4307ae85c71c9897932d1d08830f8beb623a8 SHA1 15283391a6b11557ae61bb659367f538eaca3279 SHA256 b6a0128cbfef6e83b03feb8976f9e2223a93984bd2ad6ae149071ad2cc574663
+EBUILD beaglefs-1.0.3.ebuild 960 RMD160 c7308ec4d9e364f18cba3ff84d999395ba960414 SHA1 40d2cedfcb725817772cdd892692f9e5080254e8 SHA256 6b495e2982d639508c8fd4d4749a68113f5ee80b631860cb6afd7c50761c07dc
+MISC ChangeLog 900 RMD160 d0bed5ee89840848df846de2d6a37f7efd752915 SHA1 b4f30018dfa9da694672b991f3fc6375ec6bd720 SHA256 3c43295af30100ee8a52d1502ec64392d38a767c2f6691e2316d7525369a3269
+MISC metadata.xml 351 RMD160 82e4a4d95fb8b5459480a64f16a66b9a941180d5 SHA1 5c537547794c93c1144ad238c3188ad8422d1f0e SHA256 f4c2a0ac7d004317ce8390c2e1c7e24c1aa20f86a4093d8eecb038ffd56b74e7
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>