Version bump, bug #314803. Thanks to dev-zero for the strigi work.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 226 insertions, 15 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 933427f896c9..3f093a6a8a3c 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.70 2010/04/06 13:00:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.71 2010/04/30 21:52:27 eva Exp $
+
+*tracker-0.8.4 (30 Apr 2010)
+
+  30 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/tracker-0.8.0-strigi.patch, +tracker-0.8.4.ebuild,
+  tracker-9999.ebuild, metadata.xml:
+  Version bump, bug #314803. Thanks to dev-zero for the strigi work.
 
   06 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.7.24.ebuild:
   Make imagemagick switchable with graphicsmagick, bug #309047.
diff --git a/app-misc/tracker/files/tracker-0.8.0-strigi.patch b/app-misc/tracker/files/tracker-0.8.0-strigi.patch
new file mode 100644
index 000000000000..a9ef3104713e
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.8.0-strigi.patch
@@ -0,0 +1,24 @@
+diff -Naur tracker-0.8.0.orig/src/tracker-extract/tracker-extract.c tracker-0.8.0/src/tracker-extract/tracker-extract.c
+--- tracker-0.8.0.orig/src/tracker-extract/tracker-extract.c	2010-04-02 11:56:16.643135323 +0200
++++ tracker-0.8.0/src/tracker-extract/tracker-extract.c	2010-04-02 14:22:51.650857844 +0200
+@@ -150,7 +150,7 @@
+ 	                                   TRUE,
+ 	                                   sizeof (ModuleData));
+ 
+-#ifdef HAVE_LIBSTREAMANALYZER
++#if 0 /* disabling entirely since force_internal_extractors is not available here */
+ 	if (!force_internal_extractors) {
+ 		g_message ("Adding extractor for libstreamanalyzer");
+ 		g_message ("  Generic  match for ALL (tried first before our module)");
+diff -Naur tracker-0.8.0.orig/src/tracker-extract/tracker-topanalyzer.cpp tracker-0.8.0/src/tracker-extract/tracker-topanalyzer.cpp
+--- tracker-0.8.0.orig/src/tracker-extract/tracker-topanalyzer.cpp	2010-04-02 11:56:16.642114293 +0200
++++ tracker-0.8.0/src/tracker-extract/tracker-topanalyzer.cpp	2010-04-02 11:57:14.835861696 +0200
+@@ -39,7 +39,7 @@
+ 
+ #include <libtracker-common/tracker-type-utils.h>
+ #include <libtracker-common/tracker-os-dependant.h>
+-#include <libtracker-common/tracker-sparql-builder.h>
++#include <libtracker-client/tracker-sparql-builder.h>
+ #include <libtracker-common/tracker-ontologies.h>
+ 
+ #include <libtracker-extract/tracker-utils.h>
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index b4ce8c7ff315..9d0ca1598f95 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -15,5 +15,7 @@
     <pkg>gnome-base/nautilus</pkg> by providing entries in its context menu
   </flag>
   <flag name="playlist">Add support for playlists</flag>
+  <flag name="strigi">Add support for <pkg>app-misc/strigi</pkg> search
+  engine.</flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/tracker/tracker-0.8.4.ebuild b/app-misc/tracker/tracker-0.8.4.ebuild
new file mode 100644
index 000000000000..ecbf6515c9f7
--- /dev/null
+++ b/app-misc/tracker/tracker-0.8.4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.4.ebuild,v 1.1 2010/04/30 21:52:27 eva Exp $
+
+EAPI="2"
+G2CONF_DEBUG="no"
+
+inherit eutils gnome2 linux-info
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="http://www.tracker-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE="doc" is managed by eclass.
+IUSE="applet doc eds exif flac gnome-keyring gsf gstreamer gtk hal iptc +jpeg kmail laptop mp3 nautilus pdf playlist rss strigi test +tiff +vorbis xine +xml xmp"
+
+# Automagic, gconf, uuid, and probably more
+# TODO: quill support
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.6.16[threadsafe]
+	>=dev-libs/dbus-glib-0.82-r1
+	>=dev-libs/glib-2.20
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+	>=media-libs/libpng-1.2
+	>=x11-libs/pango-1
+	sys-apps/util-linux
+
+	applet? (
+		gnome-base/gnome-panel
+		>=x11-libs/libnotify-0.4.3
+		>=x11-libs/gtk+-2.18 )
+	eds? (
+		>=mail-client/evolution-2.25.5
+		>=gnome-extra/evolution-data-server-2.25.5 )
+	exif? ( >=media-libs/libexif-0.6 )
+	flac? ( >=media-libs/flac-1.2.1 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
+	gsf? ( >=gnome-extra/libgsf-1.13 )
+	gstreamer? ( >=media-libs/gstreamer-0.10.12 )
+	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+	gtk? (
+		>=dev-libs/libgee-0.3
+		>=x11-libs/gtk+-2.18 )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( media-libs/jpeg:0 )
+	laptop? (
+		hal? ( >=sys-apps/hal-0.5 )
+		!hal? ( >=sys-apps/devicekit-power-007 ) )
+	mp3? ( >=media-libs/id3lib-3.8.3 )
+	nautilus? (
+		gnome-base/nautilus
+		>=x11-libs/gtk+-2.18 )
+	pdf? (
+		>=x11-libs/cairo-1
+		>=app-text/poppler-0.12.3-r3[cairo,utils]
+		>=x11-libs/gtk+-2.12 )
+	playlist? ( dev-libs/totem-pl-parser )
+	rss? ( net-libs/libgrss )
+	strigi? ( >=app-misc/strigi-0.7 )
+	tiff? ( media-libs/tiff )
+	vorbis? ( >=media-libs/libvorbis-0.22 )
+	xine? ( >=media-libs/xine-lib-1 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	xmp? ( >=media-libs/exempi-2.1 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.14
+	>=dev-util/pkgconfig-0.20
+	applet? ( dev-lang/vala )
+	gtk? (
+		dev-lang/vala
+		>=dev-libs/libgee-0.3 )
+	doc? (
+		>=dev-util/gtk-doc-1.8
+		media-gfx/graphviz )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	inotify_enabled
+
+	if use gstreamer ; then
+		G2CONF="${G2CONF}
+			--enable-video-extractor=gstreamer
+			--enable-gstreamer-tagreadbin"
+		# --enable-gstreamer-helix (real media)
+	elif use xine ; then
+		G2CONF="${G2CONF} --enable-video-extractor=xine"
+	else
+		G2CONF="${G2CONF} --enable-video-extractor=external"
+	fi
+
+	# hal and dk-p are used for AC power detection
+	if use laptop; then
+		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal devkit-power)"
+	else
+		G2CONF="${G2CONF} --disable-hal --disable-devkit-power"
+	fi
+
+	if use nautilus; then
+		G2CONF="${G2CONF} --enable-nautilus-extension=yes"
+	else
+		G2CONF="${G2CONF} --enable-nautilus-extension=no"
+	fi
+
+	G2CONF="${G2CONF}
+		--disable-unac
+		--disable-functional-tests
+		--with-enca
+		$(use_enable applet tracker-status-icon)
+		$(use_enable applet tracker-search-bar)
+		$(use_enable eds evolution-miner)
+		$(use_enable exif libexif)
+		$(use_enable flac libflac)
+		$(use_enable gnome-keyring)
+		$(use_enable gsf libgsf)
+		$(use_enable gtk tracker-explorer)
+		$(use_enable gtk tracker-preferences)
+		$(use_enable gtk tracker-search-tool)
+		$(use_enable iptc libiptcdata)
+		$(use_enable jpeg libjpeg)
+		$(use_enable kmail kmail-miner)
+		$(use_enable mp3 id3lib)
+		$(use_enable pdf poppler-glib)
+		$(use_enable playlist)
+		$(use_enable rss miner-rss)
+		$(use_enable strigi libstreamanalyzer)
+		$(use_enable test unit-tests)
+		$(use_enable test functional-tests)
+		$(use_enable tiff libtiff)
+		$(use_enable vorbis libvorbis)
+		$(use_enable xml libxml2)
+		$(use_enable xmp exempi)"
+		# FIXME: useless without quill (extract mp3 albumart...)
+		# $(use_enable gtk gdkpixbuf)
+}
+
+src_prepare() {
+	# Fix build failures with USE=strigi
+	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
+
+	# FIXME: report broken tests
+	sed -e '/\/libtracker-common\/tracker-dbus\/request-client-lookup/,+1 s:^\(.*\)$:/*\1*/:' \
+		-i tests/libtracker-common/tracker-dbus-test.c || die
+	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
+		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
+		-i tests/libtracker-miner/tracker-password-provider-test.c || die
+	sed -e '/\/libtracker-db\/tracker-db-journal\/init-and-shutdown/,+1 s:^\(.*\)$:/*\1*/:' \
+		-i tests/libtracker-db/tracker-db-journal.c || die
+}
+
+src_test() {
+	export XDG_CONFIG_HOME="${T}"
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "tests failed"
+}
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 4e5a056976a9..5395cc94c181 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.16 2010/03/29 20:54:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.17 2010/04/30 21:52:27 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -16,26 +16,26 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 # USE="doc" is managed by eclass.
-IUSE="applet deskbar doc eds exif flac gnome-keyring gsf gstreamer gtk hal iptc +jpeg kmail laptop mp3 nautilus pdf playlist test +tiff +vorbis xine +xml xmp"
+IUSE="applet doc eds exif flac gnome-keyring gsf gstreamer gtk hal iptc +jpeg kmail laptop mp3 nautilus pdf playlist rss strigi test +tiff +vorbis xine +xml xmp"
 
 # Automagic, gconf, uuid, and probably more
-# TODO: grss, quill and streamanalyzer support
+# TODO: quill support
 RDEPEND="
 	>=app-i18n/enca-1.9
 	>=dev-db/sqlite-3.6.16[threadsafe]
 	>=dev-libs/dbus-glib-0.82-r1
 	>=dev-libs/glib-2.20
-	>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+	|| (
+		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
+		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
 	>=media-libs/libpng-1.2
 	>=x11-libs/pango-1
 	sys-apps/util-linux
 
 	applet? (
-		>=dev-libs/libgee-0.3
 		gnome-base/gnome-panel
 		>=x11-libs/libnotify-0.4.3
 		>=x11-libs/gtk+-2.18 )
-	deskbar? ( >=gnome-extra/deskbar-applet-2.19 )
 	eds? (
 		>=mail-client/evolution-2.25.5
 		>=gnome-extra/evolution-data-server-2.25.5 )
@@ -45,7 +45,9 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? ( >=media-libs/gstreamer-0.10.12 )
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? ( >=x11-libs/gtk+-2.18 )
+	gtk? (
+		>=dev-libs/libgee-0.3
+		>=x11-libs/gtk+-2.18 )
 	iptc? ( media-libs/libiptcdata )
 	jpeg? ( media-libs/jpeg:0 )
 	laptop? (
@@ -60,6 +62,8 @@ RDEPEND="
 		>=app-text/poppler-0.12.3-r3[cairo,utils]
 		>=x11-libs/gtk+-2.12 )
 	playlist? ( dev-libs/totem-pl-parser )
+	rss? ( net-libs/libgrss )
+	strigi? ( >=app-misc/strigi-0.7 )
 	tiff? ( media-libs/tiff )
 	vorbis? ( >=media-libs/libvorbis-0.22 )
 	xine? ( >=media-libs/xine-lib-1 )
@@ -77,18 +81,15 @@ DEPEND="${RDEPEND}
 		>=dev-libs/libgee-0.3 )
 	doc? (
 		media-gfx/graphviz )"
-#	test? ( gcov )
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
 function inotify_enabled() {
 	if linux_config_exists; then
 		if ! linux_chkconfig_present INOTIFY_USER; then
-			echo
 			ewarn "You should enable the INOTIFY support in your kernel."
 			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
 			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			echo
 			die 'missing CONFIG_INOTIFY'
 		fi
 	else
@@ -131,7 +132,6 @@ pkg_setup() {
 		--with-enca
 		$(use_enable applet tracker-status-icon)
 		$(use_enable applet tracker-search-bar)
-		$(use_enable deskbar deskbar-applet)
 		$(use_enable eds evolution-miner)
 		$(use_enable exif libexif)
 		$(use_enable flac libflac)
@@ -146,13 +146,14 @@ pkg_setup() {
 		$(use_enable mp3 id3lib)
 		$(use_enable pdf poppler-glib)
 		$(use_enable playlist)
+		$(use_enable rss miner-rss)
+		$(use_enable strigi libstreamanalyzer)
 		$(use_enable test unit-tests)
+		$(use_enable test functional-tests)
 		$(use_enable tiff libtiff)
 		$(use_enable vorbis libvorbis)
 		$(use_enable xml libxml2)
 		$(use_enable xmp exempi)"
-		# FIXME: Missing files to run functional tests
-		# $(use_enable test functional-tests)
 		# FIXME: useless without quill (extract mp3 albumart...)
 		# $(use_enable gtk gdkpixbuf)
 }
@@ -171,5 +172,6 @@ src_prepare() {
 
 src_test() {
 	export XDG_CONFIG_HOME="${T}"
+	unset DBUS_SESSION_BUS_ADDRESS
 	emake check || die "tests failed"
-}
+}
\ No newline at end of file