Arrange to build against upower since devicekit-power was removed a bit too early. Reduce testsuite hacks. Pin dependencies to appropriate slots. Remove old revision.

(Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

7 files changed, 616 insertions, 256 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index ecabf41f662c..eb4be8797043 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.88 2010/12/08 17:03:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.89 2010/12/22 22:52:27 eva Exp $
+
+  22 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.8.17.ebuild,
+  +files/tracker-0.8.17-tests-fixes.patch,
+  +files/tracker-0.8.17-use-upower.patch, -tracker-0.9.28.ebuild,
+  tracker-0.9.30.ebuild, tracker-9999.ebuild:
+  Arrange to build against upower since devicekit-power was removed a bit too
+  early. Reduce testsuite hacks. Pin dependencies to appropriate slots. Remove
+  old revision.
 
   08 Dec 2010; Pacho Ramos <pacho@gentoo.org> tracker-0.8.17.ebuild,
   tracker-0.9.28.ebuild, tracker-0.9.30.ebuild, tracker-9999.ebuild:
diff --git a/app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch b/app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch
new file mode 100644
index 000000000000..e06a01d1c494
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch
@@ -0,0 +1,61 @@
+From c1d19b6060bcf5c70ea1bf6eed9bb07583506f6d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 22 Dec 2010 12:46:40 +0100
+Subject: [PATCH 3/3] gentoo: tests apps are not named lt-*
+
+---
+ tests/libtracker-common/tracker-dbus-test.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tests/libtracker-common/tracker-dbus-test.c b/tests/libtracker-common/tracker-dbus-test.c
+index c029eb4..245e2d7 100644
+--- a/tests/libtracker-common/tracker-dbus-test.c
++++ b/tests/libtracker-common/tracker-dbus-test.c
+@@ -327,7 +327,7 @@ test_dbus_request_client_lookup ()
+         }
+         g_test_trap_assert_passed ();
+         g_test_trap_assert_stdout ("*TestNewOK*");
+-        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
++        g_test_trap_assert_stdout ("*tracker-dbus*");
+ 
+         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
+                 tracker_dbus_request_comment (request_id, context, 
+@@ -336,7 +336,7 @@ test_dbus_request_client_lookup ()
+         }
+         g_test_trap_assert_passed ();
+         g_test_trap_assert_stderr ("*TestCommentOK*");
+-        g_test_trap_assert_stderr ("*lt-tracker-dbus*");
++        g_test_trap_assert_stderr ("*tracker-dbus*");
+ 
+ 
+         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
+@@ -346,7 +346,7 @@ test_dbus_request_client_lookup ()
+         }
+         g_test_trap_assert_passed ();
+         g_test_trap_assert_stdout ("*TestInfoOK*");
+-        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
++        g_test_trap_assert_stdout ("*tracker-dbus*");
+ 
+         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
+                 tracker_dbus_request_debug (request_id, context, 
+@@ -355,7 +355,7 @@ test_dbus_request_client_lookup ()
+         }
+         g_test_trap_assert_passed ();
+         g_test_trap_assert_stdout ("*TestDebugOK*");
+-        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
++        g_test_trap_assert_stdout ("*tracker-dbus*");
+ 
+         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT)) {
+                 tracker_dbus_request_success (request_id, context);
+@@ -363,7 +363,7 @@ test_dbus_request_client_lookup ()
+         }
+         g_test_trap_assert_passed ();
+         g_test_trap_assert_stdout ("*Success*");
+-        g_test_trap_assert_stdout ("*lt-tracker-dbus*");
++        g_test_trap_assert_stdout ("*tracker-dbus*");
+ 
+         /* Force client shutdown */
+         tracker_dbus_enable_client_lookup (FALSE);
+-- 
+1.7.3.4
+
diff --git a/app-misc/tracker/files/tracker-0.8.17-use-upower.patch b/app-misc/tracker/files/tracker-0.8.17-use-upower.patch
new file mode 100644
index 000000000000..ef7150002020
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.8.17-use-upower.patch
@@ -0,0 +1,516 @@
+From 16a8576cb8e06de02f366002464709797aa92050 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl@debian.org>
+Date: Wed, 14 Apr 2010 03:49:31 +0200
+Subject: [PATCH 2/3] gentoo: port from libdevkit-power-gobject to libupower-glib
+
+Squashed from 0.9 series commits:
+ * 0476409b069a8a23f6829af1365426c1d8385d91
+ * cfa8dcbcbea9b80ca27636532fb38fbf5d08a110
+ * 8099bdd7c8409e7819864b4b7e315fd99383041f
+---
+ configure.ac                                    |   54 +++---
+ src/libtracker-common/Makefile.am               |   11 +-
+ src/libtracker-common/tracker-power-devicekit.c |  247 -----------------------
+ src/libtracker-common/tracker-power-upower.c    |  247 +++++++++++++++++++++++
+ src/miners/fs/tracker-miner-files.c             |   24 +-
+ 5 files changed, 291 insertions(+), 292 deletions(-)
+ delete mode 100644 src/libtracker-common/tracker-power-devicekit.c
+ create mode 100644 src/libtracker-common/tracker-power-upower.c
+
+diff --git a/configure.ac b/configure.ac
+index 4f1ebc4..7c8b284 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,7 +139,7 @@ GTK_REQUIRED=2.18.0
+ LIBXML2_REQUIRED=2.6
+ LIBNOTIFY_REQUIRED=0.4.3
+ HAL_REQUIRED=0.5
+-DEVKIT_POWER_REQUIRED=007
++UPOWER_REQUIRED=0.9.0
+ GDKPIXBUF_REQUIRED=2.12.0
+ QUILL_REQUIRED=1.0.0
+ UNAC_REQUIRED=1.0.0
+@@ -422,36 +422,36 @@ fi
+ 
+ 
+ ##################################################################
+-# Check for DeviceKit-power
++# Check for UPower
+ ##################################################################
+ 
+-AC_ARG_ENABLE(devkit_power,
+-	      AS_HELP_STRING([--disable-devkit-power],
+-			     [disable DeviceKit-power support for AC power detection [[default=auto]]]),,
+-	      [enable_devkit_power=auto])
+-
+-if test "x$enable_devkit_power" != "xno"; then
+-   PKG_CHECK_MODULES(DEVKIT_POWER,
+-		     [devkit-power-gobject >= $DEVKIT_POWER_REQUIRED],
+-		     [have_devkit_power=yes] ,
+-		     [have_devkit_power=no])
+-   AC_SUBST(DEVKIT_POWER_CFLAGS)
+-   AC_SUBST(DEVKIT_POWER_LIBS)
+-
+-   if test "x$have_devkit_power" = "xyes"; then
+-      AC_DEFINE(HAVE_DEVKIT_POWER, [], [Define if we have DEVKIT_POWER])
++AC_ARG_ENABLE(upower,
++	      AS_HELP_STRING([--disable-upower],
++			     [disable UPower support for AC power detection [[default=auto]]]),,
++	      [enable_upower=auto])
++
++if test "x$enable_upower" != "xno"; then
++   PKG_CHECK_MODULES(UPOWER,
++		     [upower-glib >= $UPOWER_REQUIRED],
++		     [have_upower=yes] ,
++		     [have_upower=no])
++   AC_SUBST(UPOWER_CFLAGS)
++   AC_SUBST(UPOWER_LIBS)
++
++   if test "x$have_upower" = "xyes"; then
++      AC_DEFINE(HAVE_UPOWER, [], [Define if we have UPOWER])
+    fi
+ else
+-   have_devkit_power="no  (disabled)"
++   have_upower="no  (disabled)"
+ fi
+ 
+-if test "x$enable_devkit_power" = "xyes"; then
+-   if test "x$have_devkit_power" != "xyes"; then
+-      AC_MSG_ERROR([Couldn't find devkit_power >= $DEVKIT_POWER_REQUIRED.])
++if test "x$enable_upower" = "xyes"; then
++   if test "x$have_upower" != "xyes"; then
++      AC_MSG_ERROR([Couldn't find upower >= $UPOWER_REQUIRED.])
+    fi
+ fi
+ 
+-AM_CONDITIONAL(HAVE_DEVKIT_POWER, test "x$have_devkit_power" = "xyes")
++AM_CONDITIONAL(HAVE_UPOWER, test "x$have_upower" = "xyes")
+ 
+ ##################################################################
+ # Check for HAL
+@@ -462,7 +462,7 @@ AC_ARG_ENABLE(hal,
+ 			     [disable HAL support for AC power detection [[default=auto]]]),,
+ 	      [enable_hal=auto])
+ 
+-if test "x$have_devkit_power" != "xyes" && test "x$enable_hal" != "xno"; then
++if test "x$have_upower" != "xyes" && test "x$enable_hal" != "xno"; then
+    PKG_CHECK_MODULES(HAL,
+                      [hal >= $HAL_REQUIRED],
+ 		     [have_hal=yes] ,
+@@ -478,8 +478,8 @@ else
+ fi
+ 
+ if test "x$enable_hal" = "xyes"; then
+-   if test "x$have_devkit_power" = "xyes"; then
+-      AC_MSG_ERROR([Only one of DeviceKit-power and HAL can be used.])
++   if test "x$have_upower" = "xyes"; then
++      AC_MSG_ERROR([Only one of UPower and HAL can be used.])
+    elif test "x$have_hal" != "xyes"; then
+       AC_MSG_ERROR([Couldn't find hal >= $HAL_REQUIRED.])
+    fi
+@@ -1797,8 +1797,8 @@ Build Configuration:
+ 	Enable unit tests:			$have_unit_tests
+ 
+ 	Support for ioprio:			$tracker_cv_have_ioprio
+-	Support for HAL:                    	$have_hal
+-	Support for DeviceKit-power:           	$have_devkit_power
++	Support for HAL:			$have_hal
++	Support for UPower:			$have_upower
+ 	Support for file monitoring:            $have_file_monitor
+ 	Support for accent stripping (unac):  	$have_unac
+ 	Support for Cyrillic languages (enca): 	$have_enca
+diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
+index 5a3d33e..555fcff 100644
+--- a/src/libtracker-common/Makefile.am
++++ b/src/libtracker-common/Makefile.am
+@@ -4,14 +4,13 @@ INCLUDES =						\
+ 	-DSHAREDIR=\""$(datadir)"\"			\
+ 	-DG_LOG_DOMAIN=\"Tracker\"			\
+ 	-DTRACKER_COMPILATION				\
+-	-DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE	\
+ 	-I$(top_srcdir)/src				\
+ 	$(WARN_CFLAGS)					\
+ 	$(GLIB2_CFLAGS)					\
+ 	$(GCOV_CFLAGS)					\
+ 	$(GIO_CFLAGS)					\
+ 	$(HAL_CFLAGS)					\
+-	$(DEVKIT_POWER_CFLAGS)				\
++	$(UPOWER_CFLAGS)				\
+ 	$(DBUS_CFLAGS)
+ 
+ libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
+@@ -23,12 +22,12 @@ else
+ os_sources = tracker-os-dependant-unix.c
+ endif
+ 
+-# Prefer DeviceKit-power for the power data if it's available, else fall back to HAL
+-if HAVE_DEVKIT_POWER
++# Prefer UPower for the power data if it's available, else fall back to HAL
++if HAVE_UPOWER
+ power_headers =						\
+ 	tracker-power.h
+ power_sources =						\
+-	tracker-power-devicekit.c
++	tracker-power-upower.c
+ else
+ if HAVE_HAL
+ power_headers =						\
+@@ -77,7 +76,7 @@ libtracker_common_la_LDFLAGS = 				\
+ libtracker_common_la_LIBADD = 				\
+ 	$(top_builddir)/src/libstemmer/libstemmer.la	\
+ 	$(HAL_LIBS)					\
+-	$(DEVKIT_POWER_LIBS)				\
++	$(UPOWER_LIBS)					\
+ 	$(DBUS_LIBS)					\
+ 	$(GIO_LIBS)					\
+ 	$(GCOV_LIBS)					\
+diff --git a/src/libtracker-common/tracker-power-devicekit.c b/src/libtracker-common/tracker-power-devicekit.c
+deleted file mode 100644
+index 4022302..0000000
+
+Hunk removed to avoid 20k patch size limit.
+
+diff --git a/src/libtracker-common/tracker-power-upower.c b/src/libtracker-common/tracker-power-upower.c
+new file mode 100644
+index 0000000..8a1b71e
+--- /dev/null
++++ b/src/libtracker-common/tracker-power-upower.c
+@@ -0,0 +1,247 @@
++/*
++ * Copyright (C) 2006, Jamie McCracken <jamiemcc@gnome.org>
++ * Copyright (C) 2008, Nokia <ivan.frade@nokia.com>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA  02110-1301, USA.
++ */
++
++#include "config.h"
++
++#ifdef HAVE_UPOWER
++
++#include <upower.h>
++
++#include "tracker-power.h"
++
++#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_POWER, TrackerPowerPriv))
++
++typedef struct {
++	UpClient  *client;
++	gboolean   on_battery;
++	gboolean   on_low_battery;
++} TrackerPowerPriv;
++
++static void     tracker_power_finalize          (GObject         *object);
++static void     tracker_power_get_property      (GObject         *object,
++                                                 guint            param_id,
++                                                 GValue                  *value,
++                                                 GParamSpec      *pspec);
++static void     tracker_power_client_changed_cb (UpClient        *client,
++                                                 TrackerPower    *power);
++
++enum {
++	PROP_0,
++	PROP_ON_BATTERY,
++	PROP_ON_LOW_BATTERY,
++	PROP_BATTERY_PERCENTAGE
++};
++
++G_DEFINE_TYPE (TrackerPower, tracker_power, G_TYPE_OBJECT);
++
++static void
++tracker_power_class_init (TrackerPowerClass *klass)
++{
++	GObjectClass *object_class;
++
++	object_class = G_OBJECT_CLASS (klass);
++
++	object_class->finalize     = tracker_power_finalize;
++	object_class->get_property = tracker_power_get_property;
++
++	g_object_class_install_property (object_class,
++	                                 PROP_ON_BATTERY,
++	                                 g_param_spec_boolean ("on-battery",
++	                                                       "Battery in use",
++	                                                       "Whether the battery is being used",
++	                                                       FALSE,
++	                                                       G_PARAM_READABLE));
++
++	g_object_class_install_property (object_class,
++	                                 PROP_ON_LOW_BATTERY,
++	                                 g_param_spec_boolean ("on-low-battery",
++	                                                       "Battery low",
++	                                                       "Whether the battery is low",
++	                                                       FALSE,
++	                                                       G_PARAM_READABLE));
++	g_object_class_install_property (object_class,
++	                                 PROP_BATTERY_PERCENTAGE,
++	                                 g_param_spec_double ("battery-percentage",
++	                                                      "Battery percentage",
++	                                                      "Current battery percentage left",
++	                                                      0.0,
++	                                                      1.0,
++	                                                      0.0,
++	                                                      G_PARAM_READABLE));
++
++	g_type_class_add_private (object_class, sizeof (TrackerPowerPriv));
++}
++
++static void
++tracker_power_init (TrackerPower *power)
++{
++	TrackerPowerPriv *priv;
++
++	g_message ("Initializing UPower...");
++
++	priv = GET_PRIV (power);
++
++	/* connect to a UPower instance */
++	priv->client = up_client_new ();
++	g_signal_connect (priv->client, "changed",
++	                  G_CALLBACK (tracker_power_client_changed_cb), power);
++
++	/* coldplug */
++	priv->on_battery = up_client_get_on_battery (priv->client);
++	priv->on_low_battery = up_client_get_on_low_battery (priv->client);
++}
++
++static void
++tracker_power_finalize (GObject *object)
++{
++	TrackerPowerPriv *priv;
++
++	priv = GET_PRIV (object);
++
++	g_object_unref (priv->client);
++
++	(G_OBJECT_CLASS (tracker_power_parent_class)->finalize) (object);
++}
++
++static void
++tracker_power_get_property (GObject    *object,
++                            guint       param_id,
++                            GValue     *value,
++                            GParamSpec *pspec)
++{
++	TrackerPowerPriv *priv;
++
++	priv = GET_PRIV (object);
++
++	switch (param_id) {
++	case PROP_ON_BATTERY:
++		g_value_set_boolean (value, priv->on_battery);
++		break;
++	case PROP_ON_LOW_BATTERY:
++		g_value_set_boolean (value, priv->on_low_battery);
++		break;
++	default:
++		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
++		break;
++	};
++}
++
++/**
++ * tracker_power_client_changed_cb:
++ **/
++static void
++tracker_power_client_changed_cb (UpClient *client, TrackerPower *power)
++{
++	gboolean on_battery;
++	gboolean on_low_battery;
++	TrackerPowerPriv *priv;
++
++	priv = GET_PRIV (power);
++
++	/* get the on-battery state */
++	on_battery = up_client_get_on_battery (priv->client);
++	if (on_battery != priv->on_battery) {
++		priv->on_battery = on_battery;
++		g_object_notify (G_OBJECT (power), "on-battery");
++	}
++
++	/* get the on-low-battery state */
++	on_low_battery = up_client_get_on_low_battery (priv->client);
++	if (on_low_battery != priv->on_low_battery) {
++		priv->on_low_battery = on_low_battery;
++		g_object_notify (G_OBJECT (power), "on-low-battery");
++	}
++}
++
++/**
++ * tracker_power_new:
++ *
++ * Creates a new instance of #TrackerPower.
++ *
++ * Returns: The newly created #TrackerPower.
++ **/
++TrackerPower *
++tracker_power_new ()
++{
++	return g_object_new (TRACKER_TYPE_POWER, NULL);
++}
++
++/**
++ * tracker_power_get_on_battery:
++ * @power: A #TrackerPower.
++ *
++ * Returns whether the computer battery (if any) is currently in use.
++ *
++ * Returns: #TRUE if the computer is running on battery power.
++ **/
++gboolean
++tracker_power_get_on_battery (TrackerPower *power)
++{
++	TrackerPowerPriv *priv;
++
++	g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
++
++	priv = GET_PRIV (power);
++
++	return priv->on_battery;
++}
++
++/**
++ * tracker_power_get_on_low_battery:
++ * @power: A #TrackerPower
++ *
++ * Returns whether the computer has batteries.
++ *
++ * Returns: #TRUE if the computer has batteries available.
++ **/
++gboolean
++tracker_power_get_on_low_battery (TrackerPower *power)
++{
++	TrackerPowerPriv *priv;
++
++	g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
++
++	priv = GET_PRIV (power);
++
++	return priv->on_low_battery;
++}
++
++/**
++ * tracker_power_get_battery_percentage:
++ * @power: A #TrackerPower
++ *
++ * Returns the percentage of battery power available.
++ *
++ * Returns: #gdouble representing the percentage between 0.0 and 1.0.
++ **/
++gdouble
++tracker_power_get_battery_percentage (TrackerPower *power)
++{
++	TrackerPowerPriv *priv;
++
++	g_return_val_if_fail (TRACKER_IS_POWER (power), TRUE);
++
++	priv = GET_PRIV (power);
++
++	/* FIXME: Implement */
++	return 0.5;
++}
++
++#endif /* HAVE_UPOWER */
+diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
+index 86364ab..6732364 100644
+--- a/src/miners/fs/tracker-miner-files.c
++++ b/src/miners/fs/tracker-miner-files.c
+@@ -76,9 +76,9 @@ struct TrackerMinerFilesPrivate {
+ 
+ 	guint low_battery_pause_cookie;
+ 
+-#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
++#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+ 	TrackerPower *power;
+-#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
++#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+ 	gulong finished_handler;
+ 
+ 	DBusGProxy *extractor_proxy;
+@@ -225,7 +225,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
+ 	                  G_CALLBACK (mount_point_removed_cb),
+ 	                  mf);
+ 
+-#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
++#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+ 	priv->power = tracker_power_new ();
+ 
+ 	g_signal_connect (priv->power, "notify::on-low-battery",
+@@ -234,7 +234,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
+ 	g_signal_connect (priv->power, "notify::on-battery",
+ 	                  G_CALLBACK (battery_status_cb),
+ 	                  mf);
+-#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
++#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+ 
+ 	priv->finished_handler = g_signal_connect_after (mf, "finished",
+ 							 G_CALLBACK (miner_finished_cb),
+@@ -323,9 +323,9 @@ miner_files_finalize (GObject *object)
+                 g_slist_free (priv->index_single_directories);
+         }
+ 
+-#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
++#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+ 	g_object_unref (priv->power);
+-#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
++#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+ 
+ 	g_object_unref (priv->storage);
+ 
+@@ -375,9 +375,9 @@ miner_files_constructed (GObject *object)
+ 
+ 	mounts = tracker_storage_get_device_roots (mf->private->storage, type, TRUE);
+ 
+-#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
++#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+ 	check_battery_status (mf);
+-#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
++#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+ 
+ 	g_message ("Setting up directories to iterate from config (IndexSingleDirectory)");
+ 
+@@ -988,7 +988,7 @@ mount_point_added_cb (TrackerStorage *storage,
+ 	g_free (urn);
+ }
+ 
+-#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
++#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+ 
+ static void
+ set_up_throttle (TrackerMinerFiles *mf,
+@@ -1092,7 +1092,7 @@ index_on_battery_cb (GObject    *object,
+ 	check_battery_status (mf);
+ }
+ 
+-#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
++#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+ 
+ /* Called when mining has finished the first time */
+ static void
+@@ -1118,9 +1118,9 @@ miner_finished_cb (TrackerMinerFS *fs,
+ 		mf->private->finished_handler = 0;
+ 	}
+ 
+-#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
++#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+ 	check_battery_status (mf);
+-#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
++#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+ }
+ 
+ static void
+-- 
+1.7.3.4
+
diff --git a/app-misc/tracker/tracker-0.8.17.ebuild b/app-misc/tracker/tracker-0.8.17.ebuild
index 7ffdba92a622..f43d9fcd08a1 100644
--- a/app-misc/tracker/tracker-0.8.17.ebuild
+++ b/app-misc/tracker/tracker-0.8.17.ebuild
@@ -1,11 +1,11 @@
 # 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.17.ebuild,v 1.8 2010/12/08 17:03:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.9 2010/12/22 22:52:27 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 linux-info
+inherit autotools eutils gnome2 linux-info virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://www.tracker-project.org/"
@@ -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.24
+	>=dev-libs/glib-2.24:2
 	|| (
 		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
 		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
@@ -33,7 +33,7 @@ RDEPEND="
 	applet? (
 		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 		>=x11-libs/libnotify-0.4.3
-		>=x11-libs/gtk+-2.18 )
+		>=x11-libs/gtk+-2.18:2 )
 	eds? (
 		>=mail-client/evolution-2.25.5
 		>=gnome-extra/evolution-data-server-2.25.5 )
@@ -47,20 +47,20 @@ RDEPEND="
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3
-		>=x11-libs/gtk+-2.18 )
+		>=x11-libs/gtk+-2.18:2 )
 	iptc? ( media-libs/libiptcdata )
 	jpeg? ( virtual/jpeg:0 )
 	laptop? (
 		hal? ( >=sys-apps/hal-0.5 )
-		!hal? ( sys-power/upower ) )
+		!hal? ( >=sys-power/upower-0.9 ) )
 	mp3? ( >=media-libs/id3lib-3.8.3 )
 	nautilus? (
 		gnome-base/nautilus
-		>=x11-libs/gtk+-2.18 )
+		>=x11-libs/gtk+-2.18:2 )
 	pdf? (
 		>=x11-libs/cairo-1
 		>=app-text/poppler-0.12.3-r3[cairo,utils]
-		>=x11-libs/gtk+-2.12 )
+		>=x11-libs/gtk+-2.12:2 )
 	playlist? ( dev-libs/totem-pl-parser )
 	rss? ( net-libs/libgrss )
 	strigi? ( >=app-misc/strigi-0.7 )
@@ -73,17 +73,16 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=sys-devel/gettext-0.14
 	>=dev-util/pkgconfig-0.20
-	applet? ( dev-lang/vala )
+	>=dev-util/gtk-doc-am-1.8
+	applet? ( dev-lang/vala:0 )
 	gtk? (
-		dev-lang/vala
+		dev-lang/vala:0
 		>=dev-libs/libgee-0.3 )
 	doc? (
 		>=dev-util/gtk-doc-1.8
 		media-gfx/graphviz )
 	test? ( sys-apps/dbus[X] )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 function inotify_enabled() {
 	if linux_config_exists; then
 		if ! linux_chkconfig_present INOTIFY_USER; then
@@ -113,22 +112,15 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-video-extractor=external"
 	fi
 
-	# hal and dk-p are used for AC power detection
+	# hal and upower 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"
+		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal upower)"
 	else
-		G2CONF="${G2CONF} --enable-nautilus-extension=no"
+		G2CONF="${G2CONF} --disable-hal --disable-upower"
 	fi
 
 	G2CONF="${G2CONF}
 		--disable-unac
-		--disable-functional-tests
 		--with-enca
 		$(use_enable applet tracker-status-icon)
 		$(use_enable applet tracker-search-bar)
@@ -144,6 +136,7 @@ pkg_setup() {
 		$(use_enable jpeg libjpeg)
 		$(use_enable kmail miner-kmail)
 		$(use_enable mp3 id3lib)
+		$(use_enable nautilus nautilus-extension)
 		$(use_enable pdf poppler-glib)
 		$(use_enable playlist)
 		$(use_enable rss miner-rss)
@@ -156,6 +149,8 @@ pkg_setup() {
 		$(use_enable xmp exempi)"
 		# FIXME: useless without quill (extract mp3 albumart...)
 		# $(use_enable gtk gdkpixbuf)
+
+	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
 src_prepare() {
@@ -168,19 +163,21 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.8.17-build-with-eds232.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
+	epatch "${FILESDIR}/${PN}-0.8.17-tests-fixes.patch"
 	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
+
+	# Build with upower instead of devicekit-power
+	epatch "${FILESDIR}/${PN}-0.8.17-use-upower.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 }
 
 src_test() {
-	export XDG_CONFIG_HOME="${T}"
 	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "tests failed"
+	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
 }
 
 src_install() {
diff --git a/app-misc/tracker/tracker-0.9.28.ebuild b/app-misc/tracker/tracker-0.9.28.ebuild
deleted file mode 100644
index 146900ff6ff4..000000000000
--- a/app-misc/tracker/tracker-0.9.28.ebuild
+++ /dev/null
@@ -1,216 +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.9.28.ebuild,v 1.3 2010/12/08 17:03:47 pacho Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
-
-inherit eutils gnome2 linux-info python
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://www.tracker-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac gif gnome-keyring gsf gstreamer gtk hal iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss strigi test +tiff upnp +vorbis xine +xml xmp"
-
-# Test suite highly disfunctional, putting aside for now
-RESTRICT="test"
-
-# TODO: rest -> flickr, qt vs. gdk
-# vala is built with debug by default (see VALAFLAGS)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.26:2
-	|| (
-		>=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[bonobo] <gnome-base/gnome-panel-2.32 )
-		>=x11-libs/gtk+-2.18:2 )
-	eds? (
-		>=mail-client/evolution-2.29.1
-		>=gnome-extra/evolution-data-server-2.29.1 )
-	exif? ( >=media-libs/libexif-0.6 )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? (
-		app-text/odt2txt
-		>=gnome-extra/libgsf-1.13 )
-	upnp? ( >=media-libs/gupnp-dlna-0.3 )
-	!upnp? (
-		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? ( virtual/jpeg:0 )
-	laptop? (
-		hal? ( >=sys-apps/hal-0.5 )
-		!hal? ( >=sys-power/upower-0.9 ) )
-	mp3? ( >=media-libs/taglib-1.6 )
-	nautilus? (
-		gnome-base/nautilus
-		>=x11-libs/gtk+-2.18:2 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	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-0.11.1:0.12 )
-	gtk? (
-		>=dev-lang/vala-0.11.1:0.12
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-
-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 upnp ; then
-		G2CONF="${G2CONF} --enable-video-extractor=gupnp-dlna"
-	elif 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 upower are used for AC power detection
-	if use laptop; then
-		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal upower)"
-	else
-		G2CONF="${G2CONF} --disable-hal --disable-upower"
-	fi
-
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	G2CONF="${G2CONF}
-		--disable-functional-tests
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=glib
-		$(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 mp3 taglib)
-		$(use_enable nautilus nautilus-extension)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable strigi libstreamanalyzer)
-		$(use_enable test unit-tests)
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-		# FIXME: handle gdk vs qt for mp3 thumbnail extract
-		# $(use_enable gtk gdkpixbuf)
-		# FIXME: missing some files ?
-		# $(use_enable test functional-tests)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Fix build failures with USE=strigi
-	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs 2 "${S}"/tests/tracker-writeback/*.py
-	python_convert_shebangs 2 "${S}"/tests/functional-tests/*.py
-	python_convert_shebangs 2 "${S}"/utils/data-generators/cc/{*.py,generate}
-	python_convert_shebangs 2 "${S}"/utils/gtk-sparql/*.py
-	python_convert_shebangs 2 "${S}"/examples/rss-reader/*.py
-
-	# FIXME: report broken/disabled 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-data/tracker-db-journal.c || die
-	# Needs to setup a fake system dbus
-	sed -e 's/tracker-test//' \
-		-i tests/libtracker-sparql/Makefile.{am,in} || die
-	sed -e 's/tracker-test-xmp//' \
-		-i tests/libtracker-extract/Makefile.{am,in} || die
-	sed -e 's/tracker-test//' \
-		-i tests/tracker-steroids/Makefile.{am,in} || die
-}
-
-src_test() {
-	export XDG_CONFIG_HOME="${T}"
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-	# Tracker and none of the plugins it provides needs la files
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/app-misc/tracker/tracker-0.9.30.ebuild b/app-misc/tracker/tracker-0.9.30.ebuild
index 1bbb6c020ad1..6e0dcfd3cf9b 100644
--- a/app-misc/tracker/tracker-0.9.30.ebuild
+++ b/app-misc/tracker/tracker-0.9.30.ebuild
@@ -1,12 +1,12 @@
 # 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.9.30.ebuild,v 1.2 2010/12/08 17:03:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.9.30.ebuild,v 1.3 2010/12/22 22:52:27 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2"
 
-inherit eutils gnome2 linux-info python
+inherit eutils gnome2 linux-info python virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://www.tracker-project.org/"
@@ -187,13 +187,9 @@ src_prepare() {
 	python_convert_shebangs 2 "${S}"/examples/rss-reader/*.py
 
 	# FIXME: report broken/disabled 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-data/tracker-db-journal.c || die
 	# Needs to setup a fake system dbus
 	sed -e 's/tracker-test//' \
 		-i tests/libtracker-sparql/Makefile.{am,in} || die
@@ -204,9 +200,8 @@ src_prepare() {
 }
 
 src_test() {
-	export XDG_CONFIG_HOME="${T}"
 	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "tests failed"
+	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
 }
 
 src_install() {
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index a0e34e991afd..a9176561a186 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.30 2010/12/08 17:03:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.31 2010/12/22 22:52:27 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -193,9 +193,8 @@ src_prepare() {
 }
 
 src_test() {
-	export XDG_CONFIG_HOME="${T}"
 	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "tests failed"
+	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
 }
 
 src_install() {