Add patch for epiphany and dbus

Package-Manager: portage-2.1.4.4

7 files changed, 68 insertions, 221 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/Manifest b/app-misc/beagle/Manifest
index 2506c0e21a6d..96476e6fd1eb 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,12 +1,11 @@
 AUX beagle-0.2.7-crawltweek.patch 1206 RMD160 73925987e7ced184351fed4dcded49671d062a5c SHA1 76e325807be790e1d75e8212ade97ee74f5be987 SHA256 3d5b8b0b87d46b9bba4af6b08c09a769a62ff608e4fc1a4257342b40f659096d
-AUX beagle-0.3.3-log-level-warn.patch 1556 RMD160 a216c7bf23beb5da482f8ffabd96527379ad9f74 SHA1 ebece4fdcddd336a0ea59c5584691df3859a87b0 SHA256 269e3a0ccb59b81127ee087d72800228ed78fd1ffa232898b92adb98676ef97f
+AUX beagle-0.3.4-dbus.patch 535 RMD160 34bf7927bcdbb1aa250365c973983c1073d996e6 SHA1 1f95aefc0bc853339873c1b5130f509bfc9fac45 SHA256 b866a58559926a55bedcaf4f0b08fe68fc8fb4ccbf30ce677e6585c6f1355160
+AUX beagle-0.3.4-epiphany-extension.patch 779 RMD160 314b3c7d68267a0fd51eba08d6c9d106bf9d4ce5 SHA1 9f5e081591f2b605ecadba3e208f5547ce054ecc SHA256 3ce1f5485cc48c8aa171a1335684f398c046a9b21d73f90e4ce3c58629336f9e
 AUX beagle-log-level-warn.patch 2014 RMD160 444a772662d0cf1e2b32865c87ad8308c36537c2 SHA1 7b4abc9699922c3d681b3283ca9dc2dfe0710e88 SHA256 1f8664518210dfd54ea0e229cff30cc7e41dd0651ad5ed5f608afecb49afc48e
 AUX crawl-portage 295 RMD160 979f70ae6172ffbbba21fcf8ab22964d10bf6b1a SHA1 6c8da69912829a6dd8f1bdcacc3d59acb31a9f63 SHA256 14b8423c0590ce9bc8b43ee75b7c51c02ec46031d89baeee8c0100bdc6adb31b
 DIST beagle-0.2.18.tar.bz2 1591664 RMD160 02e7fddbc2dd79eb7172ece55481541b888380e2 SHA1 02b37003e3fc223f074b0b27cc1351f9f1964ff4 SHA256 62e62b0a90f49660a6414b2fe69affee0a0bb1b1cd40ec1ccaf005e2a7f6c57b
-DIST beagle-0.3.3.tar.bz2 1820814 RMD160 148a4eb6f5aced11f72ed339c8f9b8d213d23a7c SHA1 a30bcdb584965f73661ed3dac0d5a7c9e068e983 SHA256 57a32d5980b11dae8e6d595f8178fa749bd663cc8c32762d101b1f12af438623
 DIST beagle-0.3.4.tar.bz2 1841368 RMD160 67482207d56b9c8bfdaf863b5717e9ae4d231c30 SHA1 6e1bfb49e52e33d25f05a6709bb8bb6ebb55c050 SHA256 f9f37c0cdd0cbcf59da3039a7a32f43bfe2b39aff8f56579d813f79310d2ca66
 EBUILD beagle-0.2.18.ebuild 3339 RMD160 7c845d12d2b1820acdbdc255efea86361a707ebb SHA1 9bf995ad7868c78e4450d6b3f19e378cdfdf904b SHA256 188e08c6239b982fcbbe322c035672abe570717c46c425a67bdcf0ddde5277c7
-EBUILD beagle-0.3.3.ebuild 5351 RMD160 4698781f6202f356842e184dded9b48787673a8b SHA1 436d2a653680cd1da987ed7831107414da70477e SHA256 b03a3bd7855840c0fc51ee592697c8fade757d1e0f85bfa506d27440b41b221a
-EBUILD beagle-0.3.4.ebuild 5253 RMD160 cf5bad8998817c619f26858bdda4498210d39886 SHA1 17c713813390bdcbf465e428b1bc812931a17ad6 SHA256 ce4e8d9f63132de66d0a63c79bbc742ea89ec64fb87923ea648b650879c1e8c6
-MISC ChangeLog 11900 RMD160 ccef0ed9ca10ffb421d0c31232562186da87b780 SHA1 0e46d32b3290f68c9cee18ad3cb7f380cd2f6f4c SHA256 da69a107247d6b541840c49b92e08ca2b687d631c7555b5527d885fcf1123349
+EBUILD beagle-0.3.4-r1.ebuild 5804 RMD160 169a69409e77ceddef364cbb14b58741b7cdb992 SHA1 cbb151c036b7156f9422d46c9e4a6c5895f024f5 SHA256 b5350ebca7d7d17bf86c8ceb25d064739761be2ed6667a97848fa7b26a95fab5
+MISC ChangeLog 12209 RMD160 62e7818553c27bef74b6e8cdea639a8003182a76 SHA1 dab07bc4d10ad7da92845f2dc48ec8e2b25d1819 SHA256 62980e0d7c4241423f173a5f4797189167ffda9a2ef4389a04ded639aa5db094
 MISC metadata.xml 2570 RMD160 e9333423eaf9da861d11e72dbb1cb23d19de3f2d SHA1 c2ccb7d5146b1f55f57dd1112a2e443139c9591a SHA256 cee899bd0d159c75c5f6c8e3c62aa156ce7acc077bb6aafe1f91210987364fd2
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