Added a patch from Daniel Drake <dsd@gentoo.org> to fix desktop entry if the gui is disable. Fixes bug #124192.

(Portage version: 2.1_pre5-r3)

5 files changed, 182 insertions, 11 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 7d20a5e7bab5..bf2e2e18884f 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.12 2006/02/26 20:04:46 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.13 2006/03/04 16:16:59 metalgod Exp $
+
+*beagle-0.2.1-r1 (04 Mar 2006)
+
+  04 Mar 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/beagle-0.2.1-noguisettings.patch, +beagle-0.2.1-r1.ebuild:
+  Added a patch from Daniel Drake <dsd@gentoo.org> to fix desktop entry if the
+  gui is disable. Fixes bug #124192.
 
   26 Feb 2006; Luis Medinas <metalgod@gentoo.org> beagle-0.2.1.ebuild:
   Added a sqlite version fix. Closes bug #123928.
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 95c07b95ceb1..3f1d2de08e13 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f8137350c46c2a74b5c9a09fd8c7aa9e ChangeLog 2153
 RMD160 28309307bd7fe417d068260f448d04713d3cdcfc ChangeLog 2153
 SHA256 9982168f82aafc4bcbf991740ad3f0390dc6cd840147520a689ddd2924483598 ChangeLog 2153
@@ -10,6 +7,9 @@ SHA256 59f5f3fae250a173f6967340a0786b989ddacc7656d9ba89ca8a7a831cec3a97 beagle-0
 MD5 6c9eeb1d3f0468b7745e166a4b7ff023 beagle-0.1.2.ebuild 2942
 RMD160 9ec746a024f1e6dbe275155fa392e5864a6e26f2 beagle-0.1.2.ebuild 2942
 SHA256 51145a07054d57c991005ede13a048034ee186d7801239ad0010903f897d06aa beagle-0.1.2.ebuild 2942
+MD5 19abb9df06e236614175846986579afe beagle-0.2.1-r1.ebuild 3292
+RMD160 d2b6b60273c7c4ed7aafaac8f53b56d1692af760 beagle-0.2.1-r1.ebuild 3292
+SHA256 82d4c2b5c484194027036bb29f1ef3ed65c117bd35afc45d0720d123866e74af beagle-0.2.1-r1.ebuild 3292
 MD5 a4d0d4e12a5c95d16915000787ccfdcd beagle-0.2.1.ebuild 3247
 RMD160 2bd710fc39b2aea2ca06bd733c49389218add166 beagle-0.2.1.ebuild 3247
 SHA256 58de87b2c7df8b6f2007f7588c4ec8719348cdfb4f8110449b59e9ea12e03b30 beagle-0.2.1.ebuild 3247
@@ -22,6 +22,9 @@ SHA256 c905cc6a925ff3271e786c2b4b51b2a18113b90e9731687ee0623081719aaa24 files/be
 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
+MD5 4f027450fce7089b8233d682db4a3069 files/beagle-0.2.1-noguisettings.patch 897
+RMD160 13b04866c18de03e591e8e38407f5895fa0b1a76 files/beagle-0.2.1-noguisettings.patch 897
+SHA256 4e7074400fc3632e7ec217cb3a39e4e331c34b0f1c876736b7743118ac26cef1 files/beagle-0.2.1-noguisettings.patch 897
 MD5 4840546d3689482f55c682ef01d4807b files/digest-beagle-0.1.1 66
 RMD160 08fc4de13642536bf39cdb1dec0f647f163b3380 files/digest-beagle-0.1.1 66
 SHA256 8072f66cac068de8b722ae082ffd206cd94cd87d53c33648fdc3c5e6a4f4bb6c files/digest-beagle-0.1.1 66
@@ -31,13 +34,9 @@ SHA256 5c20d41c1f7301603bca65331db204e0a6debb098399c56c399d3ec7befbd01f files/di
 MD5 28eeb69b044b7177e490c82774c03fc7 files/digest-beagle-0.2.1 244
 RMD160 569650c37d16ea9f25d9cec3297005722b055318 files/digest-beagle-0.2.1 244
 SHA256 a66364cc99de8c05fd17c45aea84804950879b5d680d6a09e38241dc61b4183c files/digest-beagle-0.2.1 244
+MD5 28eeb69b044b7177e490c82774c03fc7 files/digest-beagle-0.2.1-r1 244
+RMD160 569650c37d16ea9f25d9cec3297005722b055318 files/digest-beagle-0.2.1-r1 244
+SHA256 a66364cc99de8c05fd17c45aea84804950879b5d680d6a09e38241dc61b4183c files/digest-beagle-0.2.1-r1 244
 MD5 8c88e9a257d221daea17b7175a7f7947 metadata.xml 314
 RMD160 e3e5e79de0549124c4693d22e1a5c35a13510e87 metadata.xml 314
 SHA256 1a2e1ce6af1bd26a8f0a16c348c39be963f09c5c4986b66c3622f32c4e4f367e metadata.xml 314
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEAgpRwUpWvClEHQoRAiC1AJ0dY9BnGWBU+jo7uZ/AuoRrCDDrmACffbuv
-4JgF2QpI3uB9Fn3bRIdzk+w=
-=miWb
------END PGP SIGNATURE-----
diff --git a/app-misc/beagle/beagle-0.2.1-r1.ebuild b/app-misc/beagle/beagle-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..f16a3084db54
--- /dev/null
+++ b/app-misc/beagle/beagle-0.2.1-r1.ebuild
@@ -0,0 +1,128 @@
+# 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.1-r1.ebuild,v 1.1 2006/03/04 16:16:59 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="~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
+				>=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
+}
+
+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"
+
+	# Sqlite configure check fix
+	sed -i -e 's/SQLITE, sqlite3/SQLITE3, sqlite3/' configure.in
+
+	# Sqlite version fix
+	sed -i -e 's/sqlite3 >= 3.3.1/sqlite3 >= 3.3/' configure.in
+
+	# Don't log so much
+	! use debug && sed -i -e \
+		's/defaultLevel = LogLevel.Debug/defaultLevel = LogLevel.Info/' \
+		Util/Logger.cs
+
+	epatch ${FILESDIR}/${P}-multilib.patch
+	epatch ${FILESDIR}/${P}-noguisettings.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
+}
+
+pkg_postinst() {
+	einfo "If available, Beagle greatly benefits from using certain operating"
+	einfo "system features such as Extended Attributes and inotify."
+	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.1-noguisettings.patch b/app-misc/beagle/files/beagle-0.2.1-noguisettings.patch
new file mode 100644
index 000000000000..9fabf46ffaa1
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.2.1-noguisettings.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/124192
+
+Index: tools/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/beagle/tools/Makefile.am,v
+retrieving revision 1.68
+diff -u -B -p -r1.68 Makefile.am
+--- tools/Makefile.am	15 Feb 2006 21:06:01 -0000	1.68
++++ tools/Makefile.am	2 Mar 2006 13:29:55 -0000
+@@ -3,9 +3,6 @@
+ 
+ CSC = mcs -debug -nowarn:0169
+ 
+-applicationsdir = $(datadir)/applications
+-applications_DATA = beagle-settings.desktop
+-
+ LOCAL_ASSEMBLIES =			\
+ 	../Util/Util.dll		\
+ 	../BeagleClient/Beagle.dll
+@@ -167,12 +164,13 @@ man_MANS = 			\
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
++if ENABLE_GUI
+ desktop_in_files = beagle-settings.desktop.in
+ desktop_files = $(desktop_in_files:.desktop.in=.desktop)
+-desktop_h_files = $(desktop_in_files:.in=.in.h)
+ 
+ desktopdir = $(datadir)/applications
+ desktop_DATA = $(desktop_files)
++endif
+ 
+ all: $(TARGETS) $(WRAPPERS)
+ 
diff --git a/app-misc/beagle/files/digest-beagle-0.2.1-r1 b/app-misc/beagle/files/digest-beagle-0.2.1-r1
new file mode 100644
index 000000000000..1db69e2d5499
--- /dev/null
+++ b/app-misc/beagle/files/digest-beagle-0.2.1-r1
@@ -0,0 +1,3 @@
+MD5 325ed91dc66fb6be060d0a5f4c8f56dd beagle-0.2.1.tar.bz2 1289109
+RMD160 e6df93f74b8481a2a4e1b5a01d79bdfe206fb618 beagle-0.2.1.tar.bz2 1289109
+SHA256 46e1bc5b93046f89d4ea825a106d5f99e76792aff9376e1e92c8699b1a06e125 beagle-0.2.1.tar.bz2 1289109