Add patch for bug #229389

Package-Manager: portage-2.1.4.4

4 files changed, 143 insertions, 2 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 296fa1fd85f3..74c9d28aff10 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.78 2008/06/07 14:40:09 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.79 2008/06/29 13:21:11 cedk Exp $
+
+*beagle-0.2.18-r1 (29 Jun 2008)
+
+  29 Jun 2008; Cédric Krier <cedk@gentoo.org>
+  +files/beagle-0.2.18-mono-1.9.1.patch, +beagle-0.2.18-r1.ebuild:
+  Add patch for bug #229389
 
 *beagle-0.3.7-r1 (07 Jun 2008)
 
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 774cab2b72bc..b0a7d5233f79 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,3 +1,4 @@
+AUX beagle-0.2.18-mono-1.9.1.patch 551 RMD160 ceb0449d09d91e960f79daea4a04eff367a8cc50 SHA1 4ad1d977d98a8daf403cb531c56ef245d6015dfa SHA256 19da8f23d5d9116470d8f7ab764886d9317cdb390ed8658627df73e3802f3871
 AUX beagle-0.2.7-crawltweek.patch 1206 RMD160 73925987e7ced184351fed4dcded49671d062a5c SHA1 76e325807be790e1d75e8212ade97ee74f5be987 SHA256 3d5b8b0b87d46b9bba4af6b08c09a769a62ff608e4fc1a4257342b40f659096d
 AUX beagle-0.3.7-evo-sharp.patch 4796 RMD160 32388714ef8efc445541cdcddb81cdcb6625523c SHA1 aad4c8b8eff698176a31b96eb96a4ad6262a087e SHA256 df9c3f03130da9a93ee95d481a59b0c83f291f2cb4a4d8289c7fa081737e52a0
 AUX beagle-log-level-warn.patch 2014 RMD160 444a772662d0cf1e2b32865c87ad8308c36537c2 SHA1 7b4abc9699922c3d681b3283ca9dc2dfe0710e88 SHA256 1f8664518210dfd54ea0e229cff30cc7e41dd0651ad5ed5f608afecb49afc48e
@@ -5,8 +6,9 @@ AUX crawl-portage 295 RMD160 979f70ae6172ffbbba21fcf8ab22964d10bf6b1a SHA1 6c8da
 DIST beagle-0.2.18.tar.bz2 1591664 RMD160 02e7fddbc2dd79eb7172ece55481541b888380e2 SHA1 02b37003e3fc223f074b0b27cc1351f9f1964ff4 SHA256 62e62b0a90f49660a6414b2fe69affee0a0bb1b1cd40ec1ccaf005e2a7f6c57b
 DIST beagle-0.3.6.tar.bz2 1776852 RMD160 c113744e24c999ddebf3c1aab6a84631694dbf3b SHA1 c6202f97f0b65771f5b2b0338083e68f78f772c6 SHA256 6dd08f21341fe5ec77600be30ea0d97c60bc289b4611038c1bf193204b8ee272
 DIST beagle-0.3.7.tar.bz2 1927176 RMD160 765dda197292c48aebf49fdc72d48358614429f0 SHA1 5c845bc3fc98f63a28ea9a53ee10d40f95c802de SHA256 75e9545a463e04fa2cd5354e57083fa646fe701bc8e3a0bfaa8d4cca628fe4ae
+EBUILD beagle-0.2.18-r1.ebuild 3390 RMD160 20c05799a316b197cb43537fed8b4d4e8fbc213f SHA1 c64fb46dbafb29fd65807d86d16dff2305a568ac SHA256 2048d90684b7426b80de7698472201f8a36fb671f00b1fab74d228935b3b11b0
 EBUILD beagle-0.2.18.ebuild 3339 RMD160 a25499ea353f0c6879cbacb09ce64161ccbb49ef SHA1 725f78a9cc74943a84e39e4fe229f1ee95a3385f SHA256 7d14fd57ad79934b11bd9b3a88f3961a152e9e11467116cf8dd104351d016134
 EBUILD beagle-0.3.6.ebuild 5658 RMD160 fe578c0d7c5a6dffd18307c23e41fe9f8e7003b7 SHA1 963a2af6064ca0ab12377d23233c53c033ea7382 SHA256 6a076d3056111e81c4cff87c90ea4ee9b4af7cb94c8bd68997011463409cfae5
 EBUILD beagle-0.3.7-r1.ebuild 5706 RMD160 39bcee03c0099c42ec5c6ab0cf166604b5fa01ff SHA1 7c54ce53226ce37e205785ea548a4f287114ec53 SHA256 963fe958f41538682c342123a6b250079292b108c96711ea45de7c19c0c70ad0
-MISC ChangeLog 13146 RMD160 a1f50cb8add556cb02fee9d676acd8e9bfab2925 SHA1 f8c9aa182a900a9d1e35c6639852e18e7769c0f7 SHA256 1714e0f777a2916128de2207a635de4602c999d3f7b1066ecbedb482ad904914
+MISC ChangeLog 13322 RMD160 c0bcdea6f3ecd3a69725bb82b13279c8daf91da0 SHA1 2f7bd84b49ff430dab8bf16b1f36a6b4dcf13601 SHA256 9761e69f851fecdc8d0d038bb8d94e36d623c5cebad59f03bed0f13dabbf2267
 MISC metadata.xml 2570 RMD160 e9333423eaf9da861d11e72dbb1cb23d19de3f2d SHA1 c2ccb7d5146b1f55f57dd1112a2e443139c9591a SHA256 cee899bd0d159c75c5f6c8e3c62aa156ce7acc077bb6aafe1f91210987364fd2
diff --git a/app-misc/beagle/beagle-0.2.18-r1.ebuild b/app-misc/beagle/beagle-0.2.18-r1.ebuild
new file mode 100644
index 000000000000..08b3445db170
--- /dev/null
+++ b/app-misc/beagle/beagle-0.2.18-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.2.18-r1.ebuild,v 1.1 2008/06/29 13:21:11 cedk Exp $
+
+EAPI=1
+
+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="chm doc eds galago gtk ole pdf python thunderbird +xscreensaver"
+
+RDEPEND=">=dev-lang/mono-1.1.18
+	app-arch/zip
+	sys-devel/gettext
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/gmime-2.2.1
+	>=dev-dotnet/gtk-sharp-2.8
+	>=gnome-base/librsvg-2
+	>=media-libs/libexif-0.6
+	>=dev-libs/libxml2-2.6.19
+	x11-libs/libX11
+	x11-libs/libXt
+	>=dev-db/sqlite-3.3.1
+	gtk? ( >=dev-dotnet/gconf-sharp-2.8
+		>=dev-dotnet/glade-sharp-2.8
+		>=dev-dotnet/gnome-sharp-2.8 )
+	eds? ( >=dev-dotnet/evolution-sharp-0.13.3
+		>=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 )
+	python? ( >=dev-python/pygtk-2.6 )
+	pdf? ( >=app-text/poppler-0.5.1 )
+	chm? ( dev-libs/chmlib )
+	galago? ( >=dev-dotnet/galago-sharp-0.5 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	!dev-libs/libbeagle"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	dev-util/pkgconfig
+	x11-proto/xproto
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	>=dev-util/intltool-0.23"
+
+pkg_setup() {
+	local fail="Re-emerge dev-libs/gmime with USE mono."
+
+	if ! built_with_use dev-libs/gmime mono; then
+		eerror "${fail}"
+		die "${fail}"
+	fi
+
+	enewgroup beagleindex
+	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Multilib fix
+	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
+		"${S}"/configure.in || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-0.2.7-crawltweek.patch
+	epatch "${FILESDIR}"/${PN}-log-level-warn.patch
+	epatch "${FILESDIR}"/${P}-mono-1.9.1.patch
+
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_compile() {
+	econf --enable-libbeagle --enable-sqlite3 \
+		$(use_enable doc gtk-doc) \
+		$(use_enable thunderbird) \
+		$(use_enable eds evolution) \
+		$(use_enable gtk gui) \
+		$(use_enable python) \
+		$(use_enable ole gsf-sharp) \
+		$(use_enable xscreensaver xss)
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	dodir /usr/share/beagle
+	insinto /usr/share/beagle
+	doins mozilla-extension/beagle.xpi
+
+	dodoc AUTHORS NEWS README
+
+	sed -i -e '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() {
+	elog "If available, Beagle greatly benefits from using certain operating"
+	elog "system features such as Extended Attributes and inotify."
+	echo
+	elog "If you want static queryables such as the portage tree and system"
+	elog "documentation you will need to edit the /etc/beagle/crawl-* files"
+	elog "and change CRAWL_ENABLE from 'no' to 'yes'."
+	echo
+	elog "For more info on how to create the optimal beagle environment, and"
+	elog "basic usage info, see the Gentoo page of the Beagle website:"
+	elog "http://www.beagle-project.org/Gentoo_Installation"
+}
diff --git a/app-misc/beagle/files/beagle-0.2.18-mono-1.9.1.patch b/app-misc/beagle/files/beagle-0.2.18-mono-1.9.1.patch
new file mode 100644
index 000000000000..d38532538bbd
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.2.18-mono-1.9.1.patch
@@ -0,0 +1,12 @@
+diff -ru beagle-0.2.18~/search/UIManager.cs beagle-0.2.18/search/UIManager.cs
+--- beagle-0.2.18~/search/UIManager.cs	2008-06-29 15:14:28.000000000 +0200
++++ beagle-0.2.18/search/UIManager.cs	2008-06-29 15:15:00.000000000 +0200
+@@ -394,7 +394,7 @@
+ 			if (ScopeChanged == null)
+ 				return;
+ 
+-			ScopeType scope = (ScopeType) System.Enum.Parse (typeof (ScopeType), ((Action) obj).Name);
++			ScopeType scope = (ScopeType) System.Enum.Parse (typeof (ScopeType), ((Gtk.Action) obj).Name);
+ 			
+ 			ScopeChanged (scope, ((ToggleAction) obj).Active);
+ 		}