Version bump, add dbus[X] to depend per bug #330403. Loads of bug fixes, clean up old revisions.

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

5 files changed, 20 insertions, 185 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 24058b126386..aa605d000f42 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,14 @@
 # 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.78 2010/08/21 15:26:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.79 2010/09/13 21:41:03 eva Exp $
+
+*tracker-0.8.17 (13 Sep 2010)
+
+  13 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> -tracker-0.8.6.ebuild,
+  -tracker-0.8.9.ebuild, tracker-0.8.15.ebuild, +tracker-0.8.17.ebuild,
+  tracker-9999.ebuild:
+  Version bump, add dbus[X] to depend per bug #330403. Loads of bug fixes,
+  clean up old revisions.
 
   21 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> tracker-0.8.15.ebuild,
   tracker-9999.ebuild:
diff --git a/app-misc/tracker/tracker-0.8.15.ebuild b/app-misc/tracker/tracker-0.8.15.ebuild
index c32b1666ad98..e283ee2139b2 100644
--- a/app-misc/tracker/tracker-0.8.15.ebuild
+++ b/app-misc/tracker/tracker-0.8.15.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-0.8.15.ebuild,v 1.3 2010/08/21 15:26:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.15.ebuild,v 1.4 2010/09/13 21:41:03 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -77,7 +77,8 @@ DEPEND="${RDEPEND}
 		>=dev-libs/libgee-0.3 )
 	doc? (
 		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )"
+		media-gfx/graphviz )
+	test? ( sys-apps/dbus[X] )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
diff --git a/app-misc/tracker/tracker-0.8.9.ebuild b/app-misc/tracker/tracker-0.8.17.ebuild
index a229965963fe..33bf4b17532c 100644
--- a/app-misc/tracker/tracker-0.8.9.ebuild
+++ b/app-misc/tracker/tracker-0.8.17.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-0.8.9.ebuild,v 1.3 2010/08/11 17:46:23 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.1 2010/09/13 21:41:03 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -22,7 +22,7 @@ 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
+	>=dev-libs/glib-2.24
 	|| (
 		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
 		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
@@ -50,7 +50,7 @@ RDEPEND="
 	jpeg? ( media-libs/jpeg:0 )
 	laptop? (
 		hal? ( >=sys-apps/hal-0.5 )
-		!hal? ( >=sys-apps/devicekit-power-007 ) )
+		!hal? ( || ( sys-power/upower >=sys-apps/devicekit-power-007 ) ) )
 	mp3? ( >=media-libs/id3lib-3.8.3 )
 	nautilus? (
 		gnome-base/nautilus
@@ -77,7 +77,8 @@ DEPEND="${RDEPEND}
 		>=dev-libs/libgee-0.3 )
 	doc? (
 		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )"
+		media-gfx/graphviz )
+	test? ( sys-apps/dbus[X] )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
diff --git a/app-misc/tracker/tracker-0.8.6.ebuild b/app-misc/tracker/tracker-0.8.6.ebuild
deleted file mode 100644
index a31bc6c63b91..000000000000
--- a/app-misc/tracker/tracker-0.8.6.ebuild
+++ /dev/null
@@ -1,176 +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/tracker/tracker-0.8.6.ebuild,v 1.2 2010/05/19 19:31:11 armin76 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="~alpha ~amd64 ~ia64 ~sparc ~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 miner-evolution)
-		$(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 miner-kmail)
-		$(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 e3944c934e1a..92fdc99b3640 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.21 2010/08/21 15:26:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.22 2010/09/13 21:41:03 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -80,7 +80,8 @@ DEPEND="${RDEPEND}
 		dev-lang/vala
 		>=dev-libs/libgee-0.3 )
 	doc? (
-		media-gfx/graphviz )"
+		media-gfx/graphviz )
+	test? ( sys-apps/dbus[X] )"
 
 DOCS="AUTHORS ChangeLog NEWS README"