Add patch for epiphany and dbus

(Portage version: 2.1.4.4)

6 files changed, 64 insertions, 216 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 6c27cc6978ee..79bdb51c58b6 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,14 @@
 # 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.71 2008/03/26 21:49:16 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.72 2008/03/29 14:58:28 cedk Exp $
+
+*beagle-0.3.4-r1 (29 Mar 2008)
+
+  29 Mar 2008; Cédric Krier <cedk@gentoo.org>
+  -files/beagle-0.3.3-log-level-warn.patch, +files/beagle-0.3.4-dbus.patch,
+  +files/beagle-0.3.4-epiphany-extension.patch, -beagle-0.3.3.ebuild,
+  -beagle-0.3.4.ebuild, +beagle-0.3.4-r1.ebuild:
+  Add patch for epiphany and dbus
 
 *beagle-0.3.4 (26 Mar 2008)
 
diff --git a/app-misc/beagle/beagle-0.3.3.ebuild b/app-misc/beagle/beagle-0.3.3.ebuild
deleted file mode 100644
index 4cc410e821e9..000000000000
--- a/app-misc/beagle/beagle-0.3.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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.3.3.ebuild,v 1.1 2008/03/25 22:24:59 cedk Exp $
-
-EAPI=1
-
-inherit gnome.org eutils autotools mono mozextension
-
-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 debug doc epiphany eds firefox galago gtk pdf inotify ole thunderbird +xscreensaver"
-
-RDEPEND="
-	>=dev-lang/mono-1.2.4
-	app-shells/bash
-	app-arch/zip
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-	>=dev-libs/gmime-2.2.1
-	>=media-libs/libexif-0.5.7
-	<=media-libs/libexif-0.7
-	>=dev-libs/libxml2-2.6.19
-	>=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
-	>=dev-dotnet/gtk-sharp-2.8
-	gtk? ( >=gnome-base/libgnome-2.0
-		>=gnome-base/gnome-vfs-2.0
-		>=dev-dotnet/gtk-sharp-2.0
-		>=x11-libs/gtk+-2.6.0
-		>=dev-libs/atk-1.2.4
-		>=gnome-base/librsvg-2.0
-		>=dev-dotnet/gconf-sharp-2.4
-		>=dev-dotnet/glade-sharp-2.4
-		>=dev-dotnet/gnome-sharp-2.4
-		>=dev-dotnet/gnomevfs-sharp-2.4 )
-	eds? ( >=dev-dotnet/evolution-sharp-0.13.3
-		>=dev-dotnet/gconf-sharp-2.4 )
-	ole? ( >=app-text/wv-1.2.3
-		>=dev-dotnet/gsf-sharp-0.8
-		>=app-office/gnumeric-1.4.3-r3 )
-	chm? ( app-doc/chmlib )
-	pdf? ( >=app-text/poppler-0.5.1 )
-	galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
-	thunderbird? ( || ( >=mail-client/mozilla-thunderbird-1.5
-			>=mail-client/mozilla-thunderbird-bin-1.5 ) )
-	firefox? ( || ( >=www-client/mozilla-firefox-1.5
-			>=www-client/mozilla-firefox-bin-1.5 ) )
-	epiphany? ( >=www-client/epiphany-extensions-2.16 )
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-	# Avahi code is currently experimental
-	#avahi?	(	>=net-dns/avahi-0.6.10 )
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/monodoc-1.2.4 )
-	dev-util/pkgconfig
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	>=dev-util/intltool-0.35"
-
-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`:' \
-		configure.in || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-0.2.7-crawltweek.patch
-	epatch "${FILESDIR}"/${P}-log-level-warn.patch
-
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_compile() {
-	econf \
-		--enable-sqlite3 \
-		--disable-avahi \
-		--disable-internal-taglib \
-		$(use_enable debug xml-dump) \
-		$(use_enable doc docs) \
-		$(use_enable epiphany epiphany-extension) \
-		$(use_enable firefox) \
-		$(use_enable thunderbird) \
-		$(use_enable eds evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable ole gsf-sharp wv1) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable inotify)
-		# Avahi code is experimental, explicitly disabled above
-		#$(use_enable avahi) \
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install 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/mozilla-firefox-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for mozilla-firefox failed!"
-		fi
-		if has_version '>=www-client/mozilla-firefox-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for mozilla-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/mozilla-thunderbird-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for mozilla-thunderbird failed!"
-		fi
-		if has_version '>=mail-client/mozilla-thunderbird-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for mozilla-thunderbird-bin failed!"
-		fi
-	fi
-
-	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."
-	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/beagle-0.3.4.ebuild b/app-misc/beagle/beagle-0.3.4-r1.ebuild
index db9919c7a4b4..4ee046ad56f8 100644
--- a/app-misc/beagle/beagle-0.3.4.ebuild
+++ b/app-misc/beagle/beagle-0.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.4.ebuild,v 1.1 2008/03/26 21:49:16 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.4-r1.ebuild,v 1.1 2008/03/29 14:58:28 cedk Exp $
 
 EAPI=1
 
@@ -52,7 +52,8 @@ RDEPEND="
 	firefox? ( || ( >=www-client/mozilla-firefox-1.5
 			>=www-client/mozilla-firefox-bin-1.5 ) )
 	epiphany? ( >=www-client/epiphany-extensions-2.16 )
-	xscreensaver? ( x11-libs/libXScrnSaver )"
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	dev-libs/libbeagle"
 	# Avahi code is currently experimental
 	#avahi?	(	>=net-dns/avahi-0.6.10 )
 
@@ -63,11 +64,24 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35"
 
 pkg_setup() {
-	local fail="Re-emerge dev-libs/gmime with USE mono."
+	local fail_gmime="Re-emerge dev-libs/gmime with USE mono."
+	local fail_libbeagle="Re-emerge dev-libs/libbeagle with USE=python."
+	local fail_epiphany="Re-emerge www-client/epiphany-extensions with USE=python."
 
 	if ! built_with_use dev-libs/gmime mono; then
-		eerror "${fail}"
-		die "${fail}"
+		eerror "${fail_gmime}"
+		die "${fail_gmime}"
+	fi
+
+	if use epiphany; then
+		if !built_with_use dev-libs/libbeagle python; then
+			eerror "${fail_libbeagle}"
+			die "${fail_libbeagle}"
+		fi
+		if !built_with_use www-client/epiphany-extensions python; then
+			eerror "${fail_epiphany}"
+			die "${fail_epiphany}"
+		fi
 	fi
 
 	enewgroup beagleindex
@@ -78,6 +92,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-epiphany-extension.patch
+	epatch "${FILESDIR}"/${P}-dbus.patch
+
 	# Multilib fix
 	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
 		configure.in || die "sed failed"
@@ -109,6 +126,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 
+	dodoc AUTHORS NEWS README
+
 	declare MOZILLA_FIVE_HOME
 	if use firefox; then
 		xpi_unpack "${S}"/firefox-extension/beagle.xpi \
@@ -144,8 +163,6 @@ src_install() {
 		fi
 	fi
 
-	dodoc AUTHORS NEWS README
-
 	sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
 		"${D}"/etc/beagle/crawl-rules/crawl-*
 
diff --git a/app-misc/beagle/files/beagle-0.3.3-log-level-warn.patch b/app-misc/beagle/files/beagle-0.3.3-log-level-warn.patch
deleted file mode 100644
index 307b10693eb0..000000000000
--- a/app-misc/beagle/files/beagle-0.3.3-log-level-warn.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: beagled/BeagleDaemon.cs
-===================================================================
---- beagled/BeagleDaemon.cs	(revision 4355)
-+++ beagled/BeagleDaemon.cs	(working copy)
-@@ -455,7 +455,7 @@
- 			// debugging this code, after all...
- 			// arg_debug ? LogLevel.Debug : LogLevel.Warn
- 			
--			Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
-+			Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
- 			Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
- 			Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
- 			Log.Always ("Command Line: {0}",
-Index: beagled/IndexHelper/IndexHelper.cs
-===================================================================
---- beagled/IndexHelper/IndexHelper.cs	(revision 4355)
-+++ beagled/IndexHelper/IndexHelper.cs	(working copy)
-@@ -92,14 +92,13 @@
- 			
- 			// 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);
- 
- 			Log.Always ("Starting Index Helper process (version {0})", ExternalStringsHack.Version);
diff --git a/app-misc/beagle/files/beagle-0.3.4-dbus.patch b/app-misc/beagle/files/beagle-0.3.4-dbus.patch
new file mode 100644
index 000000000000..3be0b2290006
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.4-dbus.patch
@@ -0,0 +1,12 @@
+diff -ru beagle-0.3.4~/search/Beagle.Search/Driver.cs beagle-0.3.4/search/Beagle.Search/Driver.cs
+--- beagle-0.3.4~/search/Beagle.Search/Driver.cs	2008-03-29 15:38:54.000000000 +0100
++++ beagle-0.3.4/search/Beagle.Search/Driver.cs	2008-03-29 15:47:06.000000000 +0100
+@@ -124,7 +124,7 @@
+ 			if (!String.IsNullOrEmpty (query) || !icon_enabled)
+ 				search.Query (query);
+ 
+-			Bus.Session.Register (new ObjectPath (PATH_NAME), search);
++			Bus.Session.Register (BUS_NAME, new ObjectPath (PATH_NAME), search);
+ 
+ 			program.Run ();
+ 		}
diff --git a/app-misc/beagle/files/beagle-0.3.4-epiphany-extension.patch b/app-misc/beagle/files/beagle-0.3.4-epiphany-extension.patch
new file mode 100644
index 000000000000..b3eb9b8a626f
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.4-epiphany-extension.patch
@@ -0,0 +1,19 @@
+diff -ru beagle-0.3.4~/epiphany-extension/Makefile.am beagle-0.3.4/epiphany-extension/Makefile.am
+--- beagle-0.3.4~/epiphany-extension/Makefile.am	2008-03-29 15:38:54.000000000 +0100
++++ beagle-0.3.4/epiphany-extension/Makefile.am	2008-03-29 15:39:43.000000000 +0100
+@@ -10,11 +10,11 @@
+ 
+ # Hack to fix distcheck
+ if INSTALL_EPIPHANY_EXTENSION
+-	extensiondir = $(EPIPHANY_EXTENSIONS_DIR)
+-	extension_DATA = $(extension_files) beagle.py
++extensiondir = $(EPIPHANY_EXTENSIONS_DIR)
++extension_DATA = $(extension_files) beagle.py
+ else
+-	extensiondir = $(libdir)/epiphany/extensions
+-	extension_DATA = $(extension_files) beagle.py
++extensiondir = $(libdir)/epiphany/extensions
++extension_DATA = $(extension_files) beagle.py
+ endif
+ 
+ EXTRA_DIST = $(extension_in_files) beagle.py.in