Rename upnp USE flag to upnp-av (bug #435768, thanks to Michał Górny). Drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

12 files changed, 34 insertions, 965 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 373f8959e784..8880795a24db 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.136 2012/11/21 23:04:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.137 2012/12/15 19:01:29 tetromino Exp $
+
+  15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/tracker-0.8.0-strigi.patch,
+  -files/tracker-0.8.17-build-with-eds232.patch,
+  -files/tracker-0.8.17-poppler-0.16.patch,
+  -files/tracker-0.8.17-tests-fixes.patch,
+  -files/tracker-0.8.17-use-upower.patch, tracker-0.12.10-r1.ebuild,
+  -tracker-0.14.2-r1.ebuild, tracker-0.14.3.ebuild, tracker-0.14.4.ebuild,
+  tracker-9999.ebuild, metadata.xml:
+  Rename upnp USE flag to upnp-av (bug #435768, thanks to Michał Górny). Drop
+  old.
 
 *tracker-0.14.4 (21 Nov 2012)
 
diff --git a/app-misc/tracker/files/tracker-0.8.0-strigi.patch b/app-misc/tracker/files/tracker-0.8.0-strigi.patch
deleted file mode 100644
index a9ef3104713e..000000000000
--- a/app-misc/tracker/files/tracker-0.8.0-strigi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/tracker-0.8.17-build-with-eds232.patch b/app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
deleted file mode 100644
index 456c64e35908..000000000000
--- a/app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8db05ac879dcd7f0e10fb76563ba62512b932bb9 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 20 Oct 2010 14:32:19 +0200
-Subject: [PATCH] gentoo: fix build with eds-2.32, cherry-picked from master
-
----
- src/plugins/evolution/tracker-evolution-plugin.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
-index 8e56d8d..991e525 100644
---- a/src/plugins/evolution/tracker-evolution-plugin.c
-+++ b/src/plugins/evolution/tracker-evolution-plugin.c
-@@ -41,7 +41,9 @@
- #include <sqlite3.h>
- 
- #include <camel/camel.h>
-+#ifndef HAVE_EDS_2_31_2
- #include <camel/camel-db.h>
-+#endif
- 
- #include <mail/mail-config.h>
- #include <mail/mail-session.h>
--- 
-1.7.3.1
-
diff --git a/app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch b/app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
deleted file mode 100644
index 224775642bf4..000000000000
--- a/app-misc/tracker/files/tracker-0.8.17-poppler-0.16.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tracker-0.8.17/configure.ac~	2010-09-02 16:26:20.000000000 +0200
-+++ tracker-0.8.17/configure.ac	2010-12-29 11:51:10.848878668 +0100
-@@ -1150,6 +1150,11 @@
- 	      [enable_poppler_glib=auto])
- 
- if test "x$enable_poppler_glib" != "xno" ; then
-+   PKG_CHECK_EXISTS([poppler-glib >= 0.16], [have_poppler_0_16_0=yes])
-+   if test "x$have_poppler_0_16_0" = "xyes"; then
-+	   AC_DEFINE([HAVE_POPPLER_0_16_0], [1], [Define to 1 if you have Poppler version 0.16.0 or higher.])
-+   fi
-+
-    PKG_CHECK_MODULES(POPPLER_GLIB,
-    		     [poppler-glib >= $POPPLER_GLIB_REQUIRED],
- 		     [have_poppler_glib=yes],
---- tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c~	2010-09-02 14:51:00.000000000 +0200
-+++ tracker-0.8.17/src/tracker-extract/tracker-extract-pdf.c	2010-12-29 11:55:36.165545335 +0100
-@@ -243,7 +243,11 @@
- 		rect.x1 = rect.y1 = 0;
- 		poppler_page_get_size (page, &rect.x2, &rect.y2);
- 
-+#if defined (HAVE_POPPLER_0_16_0)
-+		text = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
-+#else
- 		text = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
-+#endif
- 		t = tracker_text_normalize (text, n_words - words, &normalized_words);
- 
- 		words += normalized_words;
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
deleted file mode 100644
index e06a01d1c494..000000000000
--- a/app-misc/tracker/files/tracker-0.8.17-tests-fixes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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
deleted file mode 100644
index ef7150002020..000000000000
--- a/app-misc/tracker/files/tracker-0.8.17-use-upower.patch
+++ /dev/null
@@ -1,516 +0,0 @@
-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/metadata.xml b/app-misc/tracker/metadata.xml
index 339a374e937e..fcf000f27c05 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -24,7 +24,6 @@
   <flag name="thunderbird">Install email data miner plugin for
     <pkg>mail-client/thunderbird</pkg> and
 	<pkg>mail-client/thunderbird-bin</pkg></flag>
-  <flag name="upnp">Add support for video extraction via <pkg>media-libs/gupnp-dlna</pkg>.</flag>
   <flag name="xps">Add support for XPS file format through <pkg>app-text/libgxps</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/tracker/tracker-0.12.10-r1.ebuild b/app-misc/tracker/tracker-0.12.10-r1.ebuild
index b7734adb7b17..bbce179fb85f 100644
--- a/app-misc/tracker/tracker-0.12.10-r1.ebuild
+++ b/app-misc/tracker/tracker-0.12.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.3 2012/10/25 18:40:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.4 2012/12/15 19:01:29 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,7 +16,8 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
-IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
+gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
@@ -59,8 +60,8 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3:0
@@ -127,7 +128,7 @@ pkg_setup() {
 
 	if use gstreamer ; then
 		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
+		if use upnp-av; then
 			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
 		else
 			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
diff --git a/app-misc/tracker/tracker-0.14.2-r1.ebuild b/app-misc/tracker/tracker-0.14.2-r1.ebuild
deleted file mode 100644
index a87be28446c8..000000000000
--- a/app-misc/tracker/tracker-0.14.2-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.4 2012/10/25 18:40:42 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-VALA_MIN_API_VERSION="0.14"
-
-[[ ${PV} = 9999 ]] && inherit autotools git-2
-inherit eutils gnome2 linux-info multilib python vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-EGIT_REPO_URI="git://git.gnome.org/${PN}
-	http://git.gnome.org/browse/${PN}"
-[[ ${PV} = 9999 ]] && SRC_URI=""
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
-[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
-REQUIRED_USE="cue? ( gstreamer )"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4
-	|| (
-		>=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-2.91.6
-		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3:3 )
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5
-		<mail-client/evolution-3.5.3
-		<gnome-extra/evolution-data-server-3.5.3 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.0.2 )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 ) )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( dev-libs/totem-pl-parser )
-	rss? ( net-libs/libgrss )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	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 )"
-#	strigi? ( >=app-misc/strigi-0.7 )
-#	mp3? ( qt4? (  >=x11-libs/qt-gui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gtk? ( >=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/gtk-doc-1.8
-	$(vala_depend)
-"
-[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
-
-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-generic-media-extractor=gstreamer"
-		if use upnp; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	fi
-
-	# if use mp3 && (use gtk || use qt4); then
-	if use mp3 && use gtk; then
-		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-		G2CONF="${G2CONF} --enable-gdkpixbuf"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
-	# is not being generated
-	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		--enable-introspection
-		--disable-libstreamanalyzer
-		--disable-qt
-		--disable-nautilus-extension
-		$(use_enable applet tracker-search-bar)
-		$(use_enable cue libcue)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable firefox-bookmarks miner-firefox)
-		$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
-		FIREFOX=${S}/firefox-version.sh
-		$(use_enable flac libflac)
-		$(use_enable flickr miner-flickr)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable iptc libiptcdata)
-		$(use_enable iso libosinfo)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable mp3 taglib)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable thunderbird miner-thunderbird)
-		$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
-		THUNDERBIRD=${S}/thunderbird-version.sh
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-	#	$(use_enable strigi libstreamanalyzer)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999 ]]; then
-		git_src_unpack
-	else
-		gnome2_src_unpack
-	fi
-}
-
-src_prepare() {
-	# bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
-	epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -r 2 tests utils examples
-
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# FIXME: report broken tests
-	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
-
-	if [[ ${PV} = 9999 ]]; then
-		eautoreconf
-		vala_src_prepare
-	fi
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-0.14.3.ebuild b/app-misc/tracker/tracker-0.14.3.ebuild
index 737d42127f77..dd37cacf9c3f 100644
--- a/app-misc/tracker/tracker-0.14.3.ebuild
+++ b/app-misc/tracker/tracker-0.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.3.ebuild,v 1.2 2012/10/25 18:40:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.3.ebuild,v 1.3 2012/12/15 19:01:29 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -25,7 +25,8 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
+gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi
 [[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
@@ -70,8 +71,8 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3:0
@@ -152,7 +153,7 @@ src_unpack() {
 src_prepare() {
 	if use gstreamer ; then
 		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
+		if use upnp-av; then
 			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
 		else
 			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
diff --git a/app-misc/tracker/tracker-0.14.4.ebuild b/app-misc/tracker/tracker-0.14.4.ebuild
index 50cfd98174c6..08b738d7950e 100644
--- a/app-misc/tracker/tracker-0.14.4.ebuild
+++ b/app-misc/tracker/tracker-0.14.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.4.ebuild,v 1.1 2012/11/21 23:04:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.4.ebuild,v 1.2 2012/12/15 19:01:29 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -26,9 +26,7 @@ else
 fi
 # USE="doc" is managed by eclass.
 IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
-gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3
-networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml
-xmp xps" # qt4 strigi
+gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
 [[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 
 REQUIRED_USE="cue? ( gstreamer )"
@@ -74,8 +72,8 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3:0
@@ -158,7 +156,7 @@ src_unpack() {
 src_prepare() {
 	if use gstreamer ; then
 		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
+		if use upnp-av; then
 			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
 		else
 			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 8f3f1af1de71..dbce781669ef 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.54 2012/11/07 21:06:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.55 2012/12/15 19:01:29 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -25,7 +25,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi
 [[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
@@ -70,8 +70,8 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
+		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
+		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3:0
@@ -152,7 +152,7 @@ src_unpack() {
 src_prepare() {
 	if use gstreamer ; then
 		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
+		if use upnp-av; then
 			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
 		else
 			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"