Version Bump. Closes bug #130711, #130233.

(Portage version: 2.1_pre7-r5)

6 files changed, 187 insertions, 15 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 71e5a21b2198..b9fd99f2a8c3 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2006/04/12 07:55:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.26 2006/04/22 23:39:50 metalgod Exp $
+
+*beagle-0.2.5 (22 Apr 2006)
+
+  22 Apr 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/beagle-0.2.5-crawltweek.patch, files/crawl-portage,
+  +beagle-0.2.5.ebuild:
+  Version Bump. Closes bug #130711, #130233.
 
   12 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> beagle-0.2.4-r1.ebuild,
   beagle-0.2.4-r2.ebuild:
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 17c90db1d2f9..710cc6f9712f 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 873aa552300af3296525ce031acef4ed ChangeLog 5034
 RMD160 b9259994c50aa4989519800c16ca73780b541600 ChangeLog 5034
 SHA256 0cb9ef9a5269ddf12a6c90e1e06ef0a7a17d124e977663bf17f9f301b03acbe1 ChangeLog 5034
@@ -10,6 +7,9 @@ SHA256 a6bb41b3e7e08524ecae01578d93ed2c52e9429c3f4e57ba800dca3fba98093f beagle-0
 MD5 ecc70d92c1ff9a94a443526fb89600c2 beagle-0.2.4.ebuild 3142
 RMD160 be8d34898655a620f312550eff69db7af948de4b beagle-0.2.4.ebuild 3142
 SHA256 6c96ff4bb1872e7e648b32f74d7122f6261ed1885584def2b1c07a3e9dd7e59b beagle-0.2.4.ebuild 3142
+MD5 4eb41eac760539acccf6bf44d1e6c3f2 beagle-0.2.5.ebuild 3766
+RMD160 14d0b3cbc15c97a66adb233da7745e7aaba94b0f beagle-0.2.5.ebuild 3766
+SHA256 dc9d0dfe4d966a8e9e29165628f9e2f335788bbbb950a0763b21ea893939c3d0 beagle-0.2.5.ebuild 3766
 MD5 a8b3c0c4bcd3f1cd8572a271b142f3b5 files/beagle-0.2.1-multilib.patch 637
 RMD160 af87aa1d85dd0bdbf44f02a23914274d0420d2db files/beagle-0.2.1-multilib.patch 637
 SHA256 86867f480d7a0155aa5d6cc317c3d3483f45bb0751726c6c6ca5c839721f9062 files/beagle-0.2.1-multilib.patch 637
@@ -25,22 +25,21 @@ SHA256 3776720d29ba1453f28e188ce72d2e3d212cdba32cb7ffa4b00d85ad82138454 files/be
 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 5bb5938849d520eb6c12ca0b1c4c9b68 files/beagle-0.2.5-crawltweek.patch 969
+RMD160 f7197daa87007831b84136a814b46d430d9f84a3 files/beagle-0.2.5-crawltweek.patch 969
+SHA256 f3d134f66eadafedb55f3878d4a89c6c41e6c031e417ddc351717bc97301f216 files/beagle-0.2.5-crawltweek.patch 969
+MD5 94d530f89c72e4af388b108422cbee4f files/crawl-portage 295
+RMD160 979f70ae6172ffbbba21fcf8ab22964d10bf6b1a files/crawl-portage 295
+SHA256 14b8423c0590ce9bc8b43ee75b7c51c02ec46031d89baeee8c0100bdc6adb31b files/crawl-portage 295
 MD5 5c3dbe77ffde45cb741b4ca94991fbd9 files/digest-beagle-0.2.4 244
 RMD160 48fde338edc40a4429d5cceaad4d4d08349a9f88 files/digest-beagle-0.2.4 244
 SHA256 a62f3cd6363b760d83f091c12cb18cab0f48590d44dbc144cd159fad62d848b1 files/digest-beagle-0.2.4 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 6e7a0a12bcabb44247de3f0f78e1cf92 files/digest-beagle-0.2.5 244
+RMD160 e41adf8afa3755d4e1a1438e46d5596f8b0791bd files/digest-beagle-0.2.5 244
+SHA256 87b74f06d531274b8fa53f173a2e8a4084fba794fca4ad58aaeead66f129ca38 files/digest-beagle-0.2.5 244
 MD5 8c88e9a257d221daea17b7175a7f7947 metadata.xml 314
 RMD160 e3e5e79de0549124c4693d22e1a5c35a13510e87 metadata.xml 314
 SHA256 1a2e1ce6af1bd26a8f0a16c348c39be963f09c5c4986b66c3622f32c4e4f367e metadata.xml 314
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFESloKwUpWvClEHQoRAnNdAKCKLTiK0U2PQMpB4Mww4QXaIqU8hwCfVRpi
-r0xZ2FvCKCaoq2Vx+ZLcCvI=
-=rIQ9
------END PGP SIGNATURE-----
diff --git a/app-misc/beagle/beagle-0.2.5.ebuild b/app-misc/beagle/beagle-0.2.5.ebuild
new file mode 100644
index 000000000000..a51b2452516c
--- /dev/null
+++ b/app-misc/beagle/beagle-0.2.5.ebuild
@@ -0,0 +1,138 @@
+# 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.5.ebuild,v 1.1 2006/04/22 23:39:50 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 -1 /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.4-CVE-2006-1296.patch
+	epatch ${FILESDIR}/${P}-crawltweek.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
+	diropts -o beagleindex -g beagleindex
+	keepdir /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.5-crawltweek.patch b/app-misc/beagle/files/beagle-0.2.5-crawltweek.patch
new file mode 100644
index 000000000000..a026b70ae400
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.2.5-crawltweek.patch
@@ -0,0 +1,22 @@
+--- tools/crawl-rules/crawl-applications.orig	2006-04-09 20:50:31.639640376 +0100
++++ tools/crawl-rules/crawl-applications	2006-04-09 20:55:09.307428456 +0100
+@@ -2,7 +2,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/*/share/applications"
+ 
+ CRAWL_RECURSIVE="yes"
+ 
+--- tools/crawl-rules/crawl-documentation.orig	2006-04-09 20:55:29.728324008 +0100
++++ tools/crawl-rules/crawl-documentation	2006-04-09 20:58:47.749220256 +0100
+@@ -2,7 +2,7 @@
+ 
+ CRAWL_INDEX_NAME="documentation"
+ 
+-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /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/crawl-portage b/app-misc/beagle/files/crawl-portage
index c292daab6e7e..ec0c16f34fa7 100644
--- a/app-misc/beagle/files/crawl-portage
+++ b/app-misc/beagle/files/crawl-portage
@@ -1,4 +1,7 @@
-# Beagle Crawl Setup
+# Beagle Portage Crawl Setup
+
+source /etc/make.globals
+source /etc/make.conf
 
 CRAWL_ENABLED="no"
 
diff --git a/app-misc/beagle/files/digest-beagle-0.2.5 b/app-misc/beagle/files/digest-beagle-0.2.5
new file mode 100644
index 000000000000..aa2c1253080b
--- /dev/null
+++ b/app-misc/beagle/files/digest-beagle-0.2.5
@@ -0,0 +1,3 @@
+MD5 7a7965768643045f7e6f362f9bba1af4 beagle-0.2.5.tar.bz2 1356132
+RMD160 cbb9f8c94838da93b11ab375534d1af4315b908b beagle-0.2.5.tar.bz2 1356132
+SHA256 03418de1095be30042ba34394a15c2105094db0902e2a3e7877bcc451971eff1 beagle-0.2.5.tar.bz2 1356132