Revbump to modify the crawl-portage to use portdir instead of /usr/portage. Added kde paths to our crawltweek patch and add a upstream patch to fix a search crash thanks to Arif Lukito <maxima.bugs@gmail.com> and Pat Double <double@inebraska.com>.

(Portage version: 2.1_pre7-r5)

7 files changed, 182 insertions, 10 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index a2de9920dfdd..123d1eea0b67 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.23 2006/04/09 23:44:09 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.24 2006/04/10 19:05:48 metalgod Exp $
+
+*beagle-0.2.4-r2 (10 Apr 2006)
+
+  10 Apr 2006; Luis Medinas <metalgod@gentoo.org>
+  files/beagle-0.2.4-crawltweek.patch, +files/beagle-0.2.4-searchfix.patch,
+  files/crawl-portage, +beagle-0.2.4-r2.ebuild:
+  Revbump to modify the crawl-portage to use portdir instead of /usr/portage.
+  Added kde paths to our crawltweek patch and add a upstream patch to fix a
+  search crash thanks to Arif Lukito <maxima.bugs@gmail.com> and Pat Double
+  <double@inebraska.com>.
 
   09 Apr 2006; Stefan Jones <cretin@gentoo.org> beagle-0.2.4-r1.ebuild:
   You want chown not chmod :-)
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 8581345e1c47..4146d69b7ef1 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -7,6 +7,9 @@ SHA256 24855cf6f2b5a7c3635035d403156c4071c55c3416e2f6ee3edef3b096594461 beagle-0
 MD5 0ad7c2206dd751312fc71baada5cca6a beagle-0.2.4-r1.ebuild 3770
 RMD160 ba779bf404d198859da426c933f00768dce5ecc8 beagle-0.2.4-r1.ebuild 3770
 SHA256 17a904fb9f87e26fe6de2cdc2af846ac0a7cf6d19ad7897761a0ec644af52155 beagle-0.2.4-r1.ebuild 3770
+MD5 301f7f30fa7c7cdeef7e90801ecf0a09 beagle-0.2.4-r2.ebuild 3807
+RMD160 2d12b7eda945030478adf1cadca4ce64a2434d8e beagle-0.2.4-r2.ebuild 3807
+SHA256 0efecb0d33338013af579fd0dc0f58d8ed42f309deef7fc55aa4a3d6f7ddff59 beagle-0.2.4-r2.ebuild 3807
 MD5 ecc70d92c1ff9a94a443526fb89600c2 beagle-0.2.4.ebuild 3142
 RMD160 be8d34898655a620f312550eff69db7af948de4b beagle-0.2.4.ebuild 3142
 SHA256 6c96ff4bb1872e7e648b32f74d7122f6261ed1885584def2b1c07a3e9dd7e59b beagle-0.2.4.ebuild 3142
@@ -19,12 +22,15 @@ SHA256 23e88f3ad291fd923cf9b346ca7cdcfedd975a9156683a36fa660f2a3d3852e1 files/be
 MD5 1a8c708b3a3d59b7474acbebf8cfecd0 files/beagle-0.2.4-CVE-2006-1296.patch 556
 RMD160 2fd1ca379d45dc719c8e96703fcb624ffba964ca files/beagle-0.2.4-CVE-2006-1296.patch 556
 SHA256 fe578c1c594001f652c4f5f977cb28474f7c44dc64a0e4a63e3006d7ab7f287e files/beagle-0.2.4-CVE-2006-1296.patch 556
-MD5 5ccebeca286dc86fcff481bae0c78efe files/beagle-0.2.4-crawltweek.patch 905
-RMD160 d6e00ebf33d77417b68c37475fe98320b32494cd files/beagle-0.2.4-crawltweek.patch 905
-SHA256 cd5fdec3ebc8bd4235f42863cba8cddda68cea272cb13351750302123325ed84 files/beagle-0.2.4-crawltweek.patch 905
-MD5 fb0e78a46198d9730e9f559a129c2cb0 files/crawl-portage 241
-RMD160 eb4bf9abac3f06788d699dd410e8644300fd4145 files/crawl-portage 241
-SHA256 aa5588402cf469195b3f0ea70b60c34047ad2119d177b8911411fc70349534b1 files/crawl-portage 241
+MD5 e5bc2c5dacc6c334775a08437c6d92bd files/beagle-0.2.4-crawltweek.patch 947
+RMD160 becc7a5ce1675d7a429933016a8159b6f80ad0b9 files/beagle-0.2.4-crawltweek.patch 947
+SHA256 3776720d29ba1453f28e188ce72d2e3d212cdba32cb7ffa4b00d85ad82138454 files/beagle-0.2.4-crawltweek.patch 947
+MD5 a8f5a7c90d5e400111b0c452365b0adb files/beagle-0.2.4-searchfix.patch 360
+RMD160 47eb53b90d9a2b7171be9232857a172555a99410 files/beagle-0.2.4-searchfix.patch 360
+SHA256 b7c847520a4f68ea3b9ea0cdefbc61cc8447f4b99af7fd7f8a444be373fd394d files/beagle-0.2.4-searchfix.patch 360
+MD5 6a176c3c40db57456ec64629fc70e106 files/crawl-portage 239
+RMD160 43f2980af52308c2bf9d5da87cd2cf4b9884636c files/crawl-portage 239
+SHA256 b0cfb78e4455508a32396e8173708aa74d2e0d89121a2c4b9b805203a6eec8c2 files/crawl-portage 239
 MD5 61cf8ee79bc77bbf9093a7565d4a3454 files/digest-beagle-0.2.3-r1 244
 RMD160 e71c7ab57f0fa065302d460c2059307ff93c831c files/digest-beagle-0.2.3-r1 244
 SHA256 ba59a434d430c770e1bafd469dd29265b9302e2196032a0f67142b2ec78b0d8f files/digest-beagle-0.2.3-r1 244
@@ -34,6 +40,9 @@ SHA256 a62f3cd6363b760d83f091c12cb18cab0f48590d44dbc144cd159fad62d848b1 files/di
 MD5 5c3dbe77ffde45cb741b4ca94991fbd9 files/digest-beagle-0.2.4-r1 244
 RMD160 48fde338edc40a4429d5cceaad4d4d08349a9f88 files/digest-beagle-0.2.4-r1 244
 SHA256 a62f3cd6363b760d83f091c12cb18cab0f48590d44dbc144cd159fad62d848b1 files/digest-beagle-0.2.4-r1 244
+MD5 5c3dbe77ffde45cb741b4ca94991fbd9 files/digest-beagle-0.2.4-r2 244
+RMD160 48fde338edc40a4429d5cceaad4d4d08349a9f88 files/digest-beagle-0.2.4-r2 244
+SHA256 a62f3cd6363b760d83f091c12cb18cab0f48590d44dbc144cd159fad62d848b1 files/digest-beagle-0.2.4-r2 244
 MD5 8c88e9a257d221daea17b7175a7f7947 metadata.xml 314
 RMD160 e3e5e79de0549124c4693d22e1a5c35a13510e87 metadata.xml 314
 SHA256 1a2e1ce6af1bd26a8f0a16c348c39be963f09c5c4986b66c3622f32c4e4f367e metadata.xml 314
diff --git a/app-misc/beagle/beagle-0.2.4-r2.ebuild b/app-misc/beagle/beagle-0.2.4-r2.ebuild
new file mode 100644
index 000000000000..e3428741da43
--- /dev/null
+++ b/app-misc/beagle/beagle-0.2.4-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.4-r2.ebuild,v 1.1 2006/04/10 19:05:49 metalgod Exp $
+
+inherit gnome.org eutils autotools mono
+
+DESCRIPTION="search tool that ransacks your personal information space to find whatever you're looking for"
+HOMEPAGE="http://www.beagle-project.org/"
+
+LICENSE="MIT Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug evo gtk ole pdf python"
+
+RDEPEND="
+	>=dev-lang/mono-1.1.10
+	app-shells/bash
+	app-arch/zip
+	sys-devel/gettext
+	>=x11-libs/gtk+-2.6.0
+	>=dev-libs/atk-1.2.4
+	>=dev-libs/gmime-2.1.19
+	>=dev-dotnet/gtk-sharp-2.8
+	>=gnome-base/librsvg-2.0
+	>=media-libs/libexif-0.6.0
+	>=dev-libs/libxml2-2.6.19
+
+	||		( 	>=dev-db/sqlite-3.3.1
+				=dev-db/sqlite-2* )
+
+	||	(	(	x11-libs/libX11
+				x11-libs/libXScrnSaver
+				x11-libs/libXt )
+		virtual/x11 )
+
+	gtk?	(	>=dev-dotnet/gconf-sharp-2.8
+				>=dev-dotnet/glade-sharp-2.8
+				>=dev-dotnet/gnome-sharp-2.8
+				>=dev-dotnet/gnome-sharp-2.8 )
+
+	python? (	>=dev-lang/python-2.3
+				>=dev-python/pygtk-2.6 )
+
+	evo?	(	>=dev-dotnet/evolution-sharp-0.10.2
+				>=dev-dotnet/gconf-sharp-2.3 )
+
+	ole?	(	>=app-text/wv-1.2.0
+				>=dev-dotnet/gsf-sharp-0.6
+				>=app-office/gnumeric-1.4.3-r3 )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	|| ( (	x11-proto/xproto
+		x11-proto/scrnsaverproto )
+	virtual/x11 )"
+
+pkg_setup() {
+	if built_with_use dev-libs/gmime mono
+	then
+		einfo "Mono support enabled in dev-libs/gmime, I will continue..."
+	else
+		eerror "Please rebuild dev-libs/gmime, with mono support enabled!"
+		eerror "Try USE=\"mono\" emerge dev-libs/gmime,"
+		eerror "or add \"mono\" to your USE string in /etc/make.conf and"
+		eerror "emerge dev-libs/gmime."
+		die "Mono USE flag must be enabled in dev-libs/gmime"
+	fi
+
+	enewgroup beagleindex
+	enewuser beagleindex -1 /bin/bash /var/lib/cache/beagle beagleindex
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# To prevent excessive revdep-rebuild, gentoo's libexif is sticking to
+	# soversion 10 for now.
+	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
+
+	# Multilib fix
+	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
+		${S}/configure.in || die "sed failed"
+
+	# Don't log so much
+	! use debug && sed -i -e \
+		's/defaultLevel = LogLevel.Debug/defaultLevel = LogLevel.Info/' \
+		Util/Logger.cs
+
+	epatch ${FILESDIR}/${PN}-0.2.1-multilib.patch
+	epatch ${FILESDIR}/${P}-CVE-2006-1296.patch
+	epatch ${FILESDIR}/${P}-crawltweek.patch
+	epatch ${FILESDIR}/${P}-searchfix.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable evo evolution) \
+		$(use_enable gtk gui) \
+		$(use_enable python ) \
+		--enable-libbeagle \
+		|| die "configure failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed!"
+
+	dodir /usr/share/beagle
+	insinto /usr/share/beagle
+	doins mozilla-extension/beagle.xpi
+
+	dodoc AUTHORS INSTALL NEWS README
+
+	sed -i 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' ${D}/etc/beagle/crawl-*
+
+	insinto /etc/beagle
+	doins ${FILESDIR}/crawl-portage
+
+	keepdir /usr/$(get_libdir)/beagle/Backends
+	keepdir /var/lib/cache/beagle/indexes
+	chmod beagleindex:beagleindex /var/lib/cache/beagle/indexes
+}
+
+pkg_postinst() {
+	einfo "If available, Beagle greatly benefits from using certain operating"
+	einfo "system features such as Extended Attributes and inotify."
+	echo
+	einfo "If you want static queryables such as the portage tree and system"
+	einfo "documentation you will need to edit the /etc/beagle/crawl-* files"
+	einfo "and change CRAWL_ENABLE from 'no' to 'yes'."
+	echo
+	einfo "For more info on how to create the optimal beagle environment, and"
+	einfo "basic usage info, see the Gentoo page of the Beagle website:"
+	einfo " http://www.beagle-project.org/Gentoo_Installation"
+}
+
diff --git a/app-misc/beagle/files/beagle-0.2.4-crawltweek.patch b/app-misc/beagle/files/beagle-0.2.4-crawltweek.patch
index 546b376e6e2d..c174ae77d253 100644
--- a/app-misc/beagle/files/beagle-0.2.4-crawltweek.patch
+++ b/app-misc/beagle/files/beagle-0.2.4-crawltweek.patch
@@ -5,7 +5,7 @@
  CRAWL_INDEX_NAME="applications"
  
 -CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
-+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /usr/kde"
++CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /usr/kde/*/share/applications"
  
  CRAWL_RECURSIVE="yes"
  
@@ -16,7 +16,7 @@
  CRAWL_INDEX_NAME="documentation"
  
 -CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help"
-+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/html /usr/share/gnome/help"
++CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/html /usr/share/gnome/help /usr/kde/*/share/doc"
  
  CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
  
diff --git a/app-misc/beagle/files/beagle-0.2.4-searchfix.patch b/app-misc/beagle/files/beagle-0.2.4-searchfix.patch
new file mode 100644
index 000000000000..4de091ffa914
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.2.4-searchfix.patch
@@ -0,0 +1,10 @@
+--- search/Search.cs.orig	2006-04-10 19:38:57.615791624 +0100
++++ search/Search.cs	2006-04-10 19:39:33.834285576 +0100
+@@ -352,6 +352,7 @@
+ 				currentQuery.HitsAddedEvent -= OnHitsAdded;
+ 				currentQuery.HitsSubtractedEvent -= OnHitsSubtracted;
+ 				currentQuery.Close ();
++				currentQuery = null;
+ 			}
+ 
+ 			pages.CurrentPage = pages.PageNum (quicktips);
diff --git a/app-misc/beagle/files/crawl-portage b/app-misc/beagle/files/crawl-portage
index bb891c2e3742..c292daab6e7e 100644
--- a/app-misc/beagle/files/crawl-portage
+++ b/app-misc/beagle/files/crawl-portage
@@ -4,7 +4,7 @@ CRAWL_ENABLED="no"
 
 CRAWL_INDEX_NAME="portage"
 
-CRAWL_PATHS="/usr/portage /var/db/pkg"
+CRAWL_PATHS="${PORTDIR} /var/db/pkg"
 
 CRAWL_ALLOW_PATTERNS="*.ebuild,ChangeLog,metadata.xml"
 
diff --git a/app-misc/beagle/files/digest-beagle-0.2.4-r2 b/app-misc/beagle/files/digest-beagle-0.2.4-r2
new file mode 100644
index 000000000000..570998561159
--- /dev/null
+++ b/app-misc/beagle/files/digest-beagle-0.2.4-r2
@@ -0,0 +1,3 @@
+MD5 bd915b5f7de56c91dae2c26121c586fa beagle-0.2.4.tar.bz2 1352602
+RMD160 a830dfcfdedc870121fb6e391d5006c8d91817e8 beagle-0.2.4.tar.bz2 1352602
+SHA256 9b026458a17e0dbefddf2f9ca186a9e37682e153b19427219028437002d7edad beagle-0.2.4.tar.bz2 1352602