Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 5 insertions, 511 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 967cfa93a9fd..8e35c67dab39 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.118
 # 2010/09/13 04:26:28 josejx Exp $
 
+  07 Oct 2010; Pacho Ramos <pacho@gentoo.org> -beagle-0.3.9-r2.ebuild,
+  -files/beagle-0.3.9-firefox-3.5.patch, -files/beagle-0.3.9-sqlite.patch,
+  -files/beagle-log-level-warn.patch, metadata.xml:
+  Remove old.
+
   13 Sep 2010; Joseph Jezak <josejx@gentoo.org> beagle-0.3.9-r3.ebuild:
   Marked ppc stable for bug #324723.
 
diff --git a/app-misc/beagle/beagle-0.3.9-r2.ebuild b/app-misc/beagle/beagle-0.3.9-r2.ebuild
deleted file mode 100644
index 9ac78716c259..000000000000
--- a/app-misc/beagle/beagle-0.3.9-r2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r2.ebuild,v 1.9 2010/07/25 19:19:25 nirbheek Exp $
-
-EAPI=2
-
-inherit base gnome.org eutils mono mozextension autotools
-
-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="avahi chm debug doc epiphany eds firefox +galago gtk +pdf +inotify +ole thunderbird +google  +xscreensaver"
-
-#See bug 248331 for blocker reason.
-RDEPEND="!!sci-libs/beagle
-	>=dev-lang/mono-1.9
-	>=app-shells/bash-3.2
-	app-arch/zip
-	>=dev-db/sqlite-3.3.1
-	>=dev-dotnet/dbus-sharp-0.6.0
-	>=dev-dotnet/dbus-glib-sharp-0.4.1
-	>=dev-dotnet/taglib-sharp-2.0
-	gtk? (
-		x11-libs/libX11
-		>=gnome-base/librsvg-2.22.0
-		sys-devel/gettext
-		>=dev-dotnet/gtk-sharp-2.12.6
-		>=dev-dotnet/gconf-sharp-2.24.0
-		>=dev-dotnet/glade-sharp-2.12.6
-		>=dev-dotnet/gnome-sharp-2.24.0
-		>=dev-dotnet/gnomevfs-sharp-2.24.0
-		dev-libs/gmime:0[mono]
-		x11-misc/xdg-utils
-		>=x11-libs/gtk+-2.14.0
-		>=dev-libs/atk-1.22.0
-	)
-	eds? (
-		>=dev-dotnet/evolution-sharp-0.18.1
-		>=dev-dotnet/gconf-sharp-2.24.0
-		>=dev-dotnet/glib-sharp-2.12.6
-		dev-libs/gmime:0[mono]
-	)
-	ole? (
-		>=app-text/wv-1.2.3
-		>=dev-dotnet/gsf-sharp-0.8.1
-		>=app-office/gnumeric-1.4.3-r3
-	)
-
-	x11-misc/shared-mime-info
-	>=dev-dotnet/glib-sharp-2.12.6
-	dev-libs/gmime:0[mono]
-	chm? ( dev-libs/chmlib )
-	pdf? ( >=app-text/poppler-0.12.3-r3[utils] )
-	galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
-	thunderbird? (
-			|| (
-				>=mail-client/thunderbird-1.5
-				>=mail-client/thunderbird-bin-1.5
-			)
-	)
-	firefox? (
-			|| (
-				>=www-client/firefox-1.5
-				>=www-client/firefox-bin-1.5
-			)
-	)
-	epiphany? (
-		>=www-client/epiphany-extensions-2.16[python]
-		>=dev-libs/libbeagle-0.3.9[python]
-	)
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	>=dev-libs/libbeagle-0.3.9
-	avahi?	( >=net-dns/avahi-0.6.10[mono] )"
-
-DEPEND="${RDEPEND}
-	doc? ( >=virtual/monodoc-1.2.4 )
-	dev-util/pkgconfig
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	>=dev-util/intltool-0.35"
-
-pkg_setup() {
-	enewgroup beagleindex
-	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
-	if use thunderbird
-	then
-		if ! use inotify
-		then
-			eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
-			eerror "Please enable the inotify use-flag also."
-			eerror "See http://bugs.gentoo.org/263781 for more information."
-			die "Please enable the inotify use-flag."
-		fi
-	fi
-}
-
-src_prepare() {
-
-	#Fix upstream bug, Gentoo bug #306313
-	epatch "${FILESDIR}"/${P}-sqlite.patch
-
-	#Fix bug 248703
-	sed -i  -e 's:VALID_EPIPHANY_VERSIONS=":VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 :' \
-		configure.in || die "epiphany sed failed"
-
-	#Fix bugs.gnome.org/556243
-	sed -i	-e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
-		search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
-	#Fix bug 283740
-	epatch "${FILESDIR}/${P}-firefox-3.5.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf 	--disable-static \
-		--disable-dependency-tracking \
-		$(use_enable debug xml-dump) \
-		$(use_enable doc docs) \
-		$(use_enable epiphany epiphany-extension) \
-		$(use_enable thunderbird) \
-		$(use_enable eds evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable ole gsf-sharp wv1) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable inotify) \
-		$(use_enable avahi) \
-		$(use_enable google googlebackends)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodoc AUTHORS NEWS README || die "dodoc failed"
-
-	declare MOZILLA_FIVE_HOME
-	if use firefox; then
-		xpi_unpack "${S}"/firefox-extension/beagle.xpi \
-		|| die "Unable to find Beagle Firefox Extension"
-		mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
-
-		if has_version '>=www-client/firefox-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for firefox failed!"
-		fi
-		if has_version '>=www-client/firefox-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for firefox-bin failed!"
-		fi
-	fi
-
-	if use thunderbird; then
-		xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
-		|| die "Unable to find Beagle Thunderbird Extension"
-		mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
-
-		if has_version '>=mail-client/thunderbird-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for thunderbird failed!"
-		fi
-		if has_version '>=mail-client/thunderbird-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for thunderbird-bin failed!"
-		fi
-	fi
-
-	sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
-		"${D}"/etc/beagle/crawl-rules/crawl-*
-
-	insinto /etc/beagle/crawl-rules
-	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."
-	elog
-	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'."
-	elog
-	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.3.9-firefox-3.5.patch b/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch
deleted file mode 100644
index 9302ed535c47..000000000000
--- a/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Fix bug 283740
-Backport of:
-From a56102700eb77cc6563b99b68acdc699a6716e73 Mon Sep 17 00:00:00 2001
-From: Tao Fei <Filia.Tao@gmail.com>
-Date: Fri, 03 Jul 2009 11:20:56 +0000
-Subject: fix name confilct bug in beaglePrefs.js (for firefox 3.5)
-
-remove some debug msg (break in firefox 3.5)
-update zh-cn locale for beagle search history sidebar
-update max firfox version to 3.5.*
-update version number to 1.1.2
-
-From upstream git.
-Link: http://git.gnome.org/cgit/beagle/commit/?id=a56102700eb77cc6563b99b68acdc699a6716e73
-
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js
---- beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js	2009-09-05 12:29:07.000000000 +0200
-@@ -2,11 +2,11 @@
-  * Beagle Extension: Index webpages you visit using the Beagle Indexing Engine.
-  * An Extension for the Firefox Browser.
-  */
- 
- // Initiate a new preference instance.
--var gPrefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch);
-+_prefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch);
- 
- var beaglePref = {
-    
-     //some constant
-     RULE_INCLUDE : 1,
-@@ -29,18 +29,18 @@
- 
-    
-     //functions used to get/set pref
-     func_factory:{
-         'get':{
--            'bool': Function.bind(gPrefService.getBoolPref,gPrefService),
--            'int': Function.bind(gPrefService.getIntPref,gPrefService),
--            'string' : Function.bind(gPrefService.getCharPref,gPrefService)
-+            'bool': Function.bind(_prefService.getBoolPref,_prefService),
-+            'int': Function.bind(_prefService.getIntPref,_prefService),
-+            'string' : Function.bind(_prefService.getCharPref,_prefService)
-         },
-         'set':{
--            'bool': Function.bind(gPrefService.setBoolPref,gPrefService),
--            'int' : Function.bind(gPrefService.setIntPref,gPrefService),
--            'string' : Function.bind(gPrefService.setCharPref,gPrefService)
-+            'bool': Function.bind(_prefService.setBoolPref,_prefService),
-+            'int' : Function.bind(_prefService.setIntPref,_prefService),
-+            'string' : Function.bind(_prefService.setCharPref,_prefService)
-         }
-     },
- 
-     prefObject : {},
-     
-@@ -318,8 +318,8 @@
-         }
-         catch(ex){
-             log("first run import error");
-             log(ex);
-         }
--    },
-+    }
- }
- 
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dir.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js
---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dir.js	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js	2009-09-05 12:29:07.000000000 +0200
-@@ -219,11 +219,11 @@
-     "   readDir(aDirPath);\n";
- 
-   return help;
- });
- 
--jslibDebug('*** load: '+JS_DIR_FILE+' OK');
-+//jslibDebug('*** load: '+JS_DIR_FILE+' OK');
- 
- } else {
-     dump("JSLIB library not loaded:\n"                                  +
-          " \tTo load use: chrome://jslib/content/jslib.js\n"            +
-          " \tThen: include(jslib_dir);\n\n");
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dirUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js
---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dirUtils.js	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js	2009-09-05 12:29:07.000000000 +0200
-@@ -171,11 +171,11 @@
-   return help;
- }
- 
- }; //END CLASS 
- 
--jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
-+//jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
- 
- } // END BLOCK JS_LIB_LOADED CHECK
- 
- else {
-     dump("JSLIB library not loaded:\n"                                  +
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/file.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js
---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/file.js	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js	2009-09-05 12:29:07.000000000 +0200
-@@ -756,11 +756,11 @@
-     "   help;\n";
- 
-   return help;
- })
- 
--jslibDebug('*** load: '+JS_FILE_FILE+' OK');
-+//jslibDebug('*** load: '+JS_FILE_FILE+' OK');
- 
- } // END BLOCK JS_LIB_LOADED CHECK
- 
- // If jslib base library is not loaded, dump this error.
- else
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/fileUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js
---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/fileUtils.js	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js	2009-09-05 12:29:07.000000000 +0200
-@@ -582,11 +582,11 @@
-     return help;
-   }
-   
- };
-   
--jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
-+//jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
-   
- } // END BLOCK JS_LIB_LOADED CHECK
-   
- // If jslib base library is not loaded, dump this error.
- else
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/locale/zh-CN/beagle.dtd beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd
---- beagle-0.3.9.orig/firefox-extension/chrome/locale/zh-CN/beagle.dtd	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd	2009-09-05 12:29:07.000000000 +0200
-@@ -29,11 +29,13 @@
- <!ENTITY beagle.run.never.index.label               "从不索引这个站点">
- <!ENTITY beagle.run.preferences.label               "选项">
- <!ENTITY beagle.run.context.menu.label              "Beagle">
- <!ENTITY beagle.run.index.link.label                "索引链接">
- <!ENTITY beagle.run.index.image.label               "索引图片">
--
- <!ENTITY beagle.index.link.start.label              "开始">
- <!ENTITY beagle.index.link.stop.label               "停止">
- 
- <!ENTITY beagle.bookmark.index.modified.label       "索引更改过的书签">
- 
-+<!ENTITY beagle.sidebar.title "Beagle 搜索历史侧边栏">
-+<!ENTITY beagle.sidebar.commandkey "B">
-+<!ENTITY beagle.sidebar.modifierskey "shift 键">
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/install.rdf.in beagle-0.3.9/firefox-extension/install.rdf.in
---- beagle-0.3.9.orig/firefox-extension/install.rdf.in	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/install.rdf.in	2009-09-05 12:29:50.000000000 +0200
-@@ -21,11 +21,11 @@
- 

-     <em:targetApplication>

-       <Description>

-         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>

-         <em:minVersion>0.8</em:minVersion>

--        <em:maxVersion>3.0.*</em:maxVersion>

-+        <em:maxVersion>3.5.*</em:maxVersion>

-       </Description>

-     </em:targetApplication>

- 

-   </Description>

- 

-diff -NrU5 beagle-0.3.9.orig/firefox-extension/Makefile.am beagle-0.3.9/firefox-extension/Makefile.am
---- beagle-0.3.9.orig/firefox-extension/Makefile.am	2009-09-05 12:28:10.000000000 +0200
-+++ beagle-0.3.9/firefox-extension/Makefile.am	2009-09-05 12:29:07.000000000 +0200
-@@ -1,8 +1,8 @@
- 
- PROJECT = beagle
--VERSION = 1.1.0
-+VERSION = 1.1.2
- 
- INSTALL_RDF = install.rdf
- INSTALL_RDF_IN = $(INSTALL_RDF).in
- VERSION_SED = sed -e "s|\@VERSION\@|$(VERSION)|g"
- 
diff --git a/app-misc/beagle/files/beagle-0.3.9-sqlite.patch b/app-misc/beagle/files/beagle-0.3.9-sqlite.patch
deleted file mode 100644
index 251b5517752f..000000000000
--- a/app-misc/beagle/files/beagle-0.3.9-sqlite.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 59f63233908b8ccee70251f698351014546d5765 Mon Sep 17 00:00:00 2001
-From: Gabriel Burt <gabriel.burt@gmail.com>
-Date: Thu, 07 Jan 2010 01:08:34 +0000
-Subject: Update to build against Mono.Data.Sqlite 2.x
-
----
-diff --git a/beagle/Util/FSpotTools.cs b/beagle/Util/FSpotTools.cs
-index 9470a0a..82f7752 100644
---- a/beagle/Util/FSpotTools.cs
-+++ b/beagle/Util/FSpotTools.cs
-@@ -85,8 +85,12 @@ namespace Beagle.Util {
- 							while (reader == null) {
- 								try {
- 									reader = command.ExecuteReader ();
--								} catch (SqliteBusyException) {
--									Thread.Sleep (50);
-+								} catch (SqliteException e) {
-+									if (e.ErrorCode == SQLiteErrorCode.Busy) {
-+										Thread.Sleep (50);
-+									} else {
-+										throw;
-+									}
- 								}
- 							}
- 							reader.Close ();
-diff --git a/beagle/beagled/SqliteUtils.cs b/beagle/beagled/SqliteUtils.cs
-index f4be4c6..f747db5 100644
---- a/beagle/beagled/SqliteUtils.cs
-+++ b/beagle/beagled/SqliteUtils.cs
-@@ -55,8 +55,13 @@ namespace Beagle.Util {
- 					try {
- 						ret = command.ExecuteNonQuery ();
- 						break;
--					} catch (SqliteBusyException ex) {
--						Thread.Sleep (50);
-+					} catch (SqliteException ex) {
-+						if (ex.ErrorCode == SQLiteErrorCode.Busy) {
-+							Thread.Sleep (50);
-+						} else {
-+							Log.Error (ex, "SQL that caused the exception: {0}", command_text);
-+							throw;
-+						}
- 					} catch (Exception e) {
- 						Log.Error (e, "SQL that caused the exception: {0}", command_text);
- 						throw;
-@@ -79,8 +84,13 @@ namespace Beagle.Util {
- 				try {
- 					ret = command.ExecuteNonQuery ();
- 					break;
--				} catch (SqliteBusyException ex) {
--					Thread.Sleep (50);
-+				} catch (SqliteException ex) {
-+					if (ex.ErrorCode == SQLiteErrorCode.Busy) {
-+						Thread.Sleep (50);
-+					} else {
-+						Log.Error (ex, "SQL that caused the exception: {0}", command.CommandText);
-+						throw;
-+					}
- 				} catch (Exception e) {
- 					Log.Error ( e, "SQL that caused the exception: {0}", command.CommandText);
- 					throw;
-@@ -96,8 +106,12 @@ namespace Beagle.Util {
- 			while (reader == null) {
- 				try {
- 					reader = command.ExecuteReader ();
--				} catch (SqliteBusyException ex) {
--					Thread.Sleep (50);
-+				} catch (SqliteException ex) {
-+					if (ex.ErrorCode == SQLiteErrorCode.Busy) {
-+						Thread.Sleep (50);
-+					} else {
-+						throw;
-+					}
- 				}
- 			}
- 			return reader;
-@@ -108,8 +122,12 @@ namespace Beagle.Util {
- 			while (true) {
- 				try {
- 					return reader.Read ();
--				} catch (SqliteBusyException ex) {
--					Thread.Sleep (50);
-+				} catch (SqliteException ex) {
-+					if (ex.ErrorCode == SQLiteErrorCode.Busy) {
-+						Thread.Sleep (50);
-+					} else {
-+						throw;
-+					}
- 				}
- 			}
- 		}
---
-cgit v0.8.3.1
diff --git a/app-misc/beagle/files/beagle-log-level-warn.patch b/app-misc/beagle/files/beagle-log-level-warn.patch
deleted file mode 100644
index cbd9d1e52eed..000000000000
--- a/app-misc/beagle/files/beagle-log-level-warn.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: beagled/BeagleDaemon.cs
-===================================================================
-RCS file: /cvs/gnome/beagle/beagled/BeagleDaemon.cs,v
-retrieving revision 1.109
-diff -u -p -u -r1.109 BeagleDaemon.cs
---- beagled/BeagleDaemon.cs	8 Mar 2006 21:01:50 -0000	1.109
-+++ beagled/BeagleDaemon.cs	17 Mar 2006 18:27:58 -0000
-@@ -371,10 +371,7 @@ namespace Beagle.Daemon {
- 
- 			Log.Initialize (PathFinder.LogDir,
- 					"Beagle", 
--					// FIXME: We always turn on full debugging output!  We are still
--					// debugging this code, after all...
--					//arg_debug ? LogLevel.Debug : LogLevel.Warn,
--					LogLevel.Debug,
-+					arg_debug ? LogLevel.Debug : LogLevel.Warn,
- 					arg_fg);
- 
- 			Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
-Index: beagled/IndexHelper/IndexHelper.cs
-===================================================================
-RCS file: /cvs/gnome/beagle/beagled/IndexHelper/IndexHelper.cs,v
-retrieving revision 1.24
-diff -u -p -u -r1.24 IndexHelper.cs
---- beagled/IndexHelper/IndexHelper.cs	8 Feb 2006 18:19:49 -0000	1.24
-+++ beagled/IndexHelper/IndexHelper.cs	4 Apr 2006 20:08:28 -0000
-@@ -61,16 +61,13 @@ namespace Beagle.IndexHelper {
- 			bool run_by_hand = (Environment.GetEnvironmentVariable ("BEAGLE_RUN_HELPER_BY_HAND") != null);
- 			bool log_in_fg = (Environment.GetEnvironmentVariable ("BEAGLE_LOG_IN_THE_FOREGROUND_PLEASE") != null);
- 			
--			// FIXME: We always turn on full debugging output!  We are still
--			// debugging this code, after all...
--			//bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
-+			bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
- 
- 			last_activity = DateTime.Now;
- 
- 			Log.Initialize (PathFinder.LogDir,
- 					"IndexHelper",
--					//debug ? LogLevel.Debug : LogLevel.Warn,
--					LogLevel.Debug,
-+					debug ? LogLevel.Debug : LogLevel.Warn,
- 					run_by_hand || log_in_fg);
- 
- 			Application.InitCheck ("IndexHelper", ref args);
diff --git a/app-misc/beagle/metadata.xml b/app-misc/beagle/metadata.xml
index b263af5cb87b..a8f8a1c8c7ff 100644
--- a/app-misc/beagle/metadata.xml
+++ b/app-misc/beagle/metadata.xml
@@ -15,9 +15,6 @@
 			<pkg>mail-client/evolution</pkg> stored in
 			<pkg>gnome-extra/evolution-data-server</pkg>. The information is
 			accessed using <pkg>dev-dotnet/evolution-sharp</pkg>.</flag>
-		<flag name='epiphany'>Compiles and installs the extension for either
-			<pkg>www-client/epiphany</pkg>. This extension helps Beagle index the
-			websites you visit.</flag>
 		<flag name='firefox'>Compiles and installs the extension for either
 			<pkg>www-client/firefox</pkg> or
 			<pkg>www-client/firefox-bin</pkg>. This extension helps