Version bump, drop old

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 30 insertions, 193 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 85091b4c5d32..e347affd21cb 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.379 2014/07/23 15:23:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.380 2014/09/04 15:33:53 pacho Exp $
+
+*totem-3.12.2 (04 Sep 2014)
+
+  04 Sep 2014; Pacho Ramos <pacho@gentoo.org> +totem-3.12.2.ebuild,
+  -files/totem-3.8.2-vimeo-compat.patch, -totem-3.10.1.ebuild, metadata.xml:
+  Version bump, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> totem-3.12.1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 73c0cd70b3cc..0fe1d15390cf 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -3,30 +3,19 @@ Hash: SHA256
 
 AUX totem-2.30.2-mp2t-support.patch 522 SHA256 fd75446210f92e4abfb0d80018f1e5aad7fc0d4ad586c222b9984e0207dde963 SHA512 77986c61a0217316de5853135de0b454a0f17e6f0b0265805452fae42fd96efd025b59fa7b7e2b600d35c071c8c095c69d5081d3d12e075a4fce4cc988b15a88 WHIRLPOOL 93091966a67469a14d6af898eb2a12ca9e212ebe5ff2bd70629e2fd61b265bef182b098b5a5b748e77f8834041dc32b9e9d30517c3bb8a78ddd9067d3222b856
 AUX totem-2.32.0-smclient-target-detection.patch 1546 SHA256 c2c454e1a1776cc7c07ba4ee069105f6010e92478e9598af23956fac0fb13e63 SHA512 ea97c322cc3d47804682120b90500274ad107c0de1b188d7c7a5426e701829a1d93dcf59766c317239f33aeab44af4311a1be38e0539345fbb5bedf8df4573bb WHIRLPOOL c2255cc3bafcd565c2fe41114922e814ab6b1de3ac90b776da8907daa3892021a863d615a4d89d1a04dc5e6ad9fac1ee0c7a4ff58f1248edadf372d41c7f7cc5
-AUX totem-3.8.2-vimeo-compat.patch 5232 SHA256 c259bd44d66828f918ad78931755a875affe0095aa152c9ff16e123396367072 SHA512 ff4401ec59f9503efbfb9ab6ade9ea06ccb8590bfbd30bea4c034bc95278f44c25700d2887c3fbcfa03cda4601cea76cc3b3e5ce318366c1e093d6bf16f5d6d1 WHIRLPOOL cfd9f5113197f529615f0f20f0e441c80092150832a15b3dfd610ab738c60726f12114104012e2db169fb4ef318564323447219dbaa89a5a915ccdbb00d11420
 DIST totem-2.32.0-patches.tar.bz2 13355 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70bbdf018418dfc7d0fa8bd28929335a30 SHA512 cedb71ecd244dad6667e67eccae3fcf912de975b7ce5911257438303abe50ae8cf488c4dad4bc8557f5049846ce7d98503cefe0aeeda7aec70028f8dec81b0bc WHIRLPOOL be4c5c8cbe7d700ca18b942cb5fd546d95434fe13535fc96b4baf9fc3b2ac5d39d4b4cc3af8e920a54d8c929e29b2a88799e8f5b984f495a3def50bcd6dc9981
 DIST totem-2.32.0.tar.bz2 3278758 SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47 SHA512 67d5d3e06a57fc355867f288f620be384c7ec3078ecfa0a223ae09d7d8b34d5b9b16de1d97e1d1bfe2b3b12cc87eed8bd8305b9f5a1bba1c4fe37cf7355e0f0f WHIRLPOOL 301f7727e1255b1fcf4b8546cc8973d5bae45bca5b84e4a516d1a1d006eb695632a33bcb04c00d360c0d00d8ba21057fab4a05b1870023febf076e35887ef40d
-DIST totem-3.10.1.tar.xz 3266668 SHA256 b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2 SHA512 cd83065e91d8dbc25be886c85542d5a1c2e99d64dd5563ddfcec984080c4755e1924d3dc44ce7fdfb3c9135d5f55d093d206c4392fb2ebb11551a6aede4dff17 WHIRLPOOL 8f9d3e543d22c392d40087b97cff23512fd833cff5a640f6497ac25dd995d2f107aebaa0bcc656b0ee29c6e85b09cf310102e415dec45e361e615406c8baafe5
 DIST totem-3.12.1.tar.xz 3316056 SHA256 dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3 SHA512 7b2601764b9715001e52345330e1ede2ba74f9588b5c63b0da595ee06609ec0971b24eed4ad9c3dc4c989e7708b03afcbd782f8d0368fc95a49aa035caccb103 WHIRLPOOL 810704760e941b17df3b2d1e44f8a6480468bd8c8fee3883cde04a884ae369ce52a02c594fd21b8fcbcd564978dd30bc131aba8c9b5065b274a1f20499f09e78
+DIST totem-3.12.2.tar.xz 3309904 SHA256 76f9d8bb04813f5c19c0d09f946a2ba42647d10e174c27e8d848afcec7005cd1 SHA512 30f88e0c394797794c4c3a977e01e80d82ed64c703c1926708243a8086547c256e6601dba0cba6b69e8b421e625c1ab2e7074cb1efff3fa43a9ab8b932befb75 WHIRLPOOL 250b757354c83c82c24ef20470276e037818c1e51960f9557bae81bc77cc1ea9d90587fcbfd88cbeab27419a38123cd951e54f612877afb257fa0895da8cc131
 EBUILD totem-2.32.0-r2.ebuild 6083 SHA256 602096eca2fbb7fa7d09215044ac96361f5b378b8646e8daba33ea0190bab160 SHA512 93fb7e90e73d796fc50a4de32248b417485b4d3f7fbad6cb337b5e9cbff01552c31df59ed6fe8af1b57bccd226217de32d55447c3db950606ba5d4891b86823f WHIRLPOOL 6cbf5edefe1a4dec0709d3ef169269a881dfef31a9774594467816730fa796bd5472c3b11b98c004e51347810d6e65ca2904799dde94bb311327cf778f7cb0af
-EBUILD totem-3.10.1.ebuild 4584 SHA256 4c059b7ea2b4f1f757e1188d9372bba5d2eb778b0fb6f52971c2650f63d20050 SHA512 1cc29f8043ae6c0c72e5ae4e694f601ebded2001424f223723eba853fa83bde1575640d11e4580f016ce299b00fc75ca2038445c447ce072e777bdd882c51be1 WHIRLPOOL e1a880d89d756f1a5cace098383c2b3524cd7ca617d78d4432051673dc2a981ba31b174ff971e39683404aca7214dff06a7d04944b976ba6cd1ae83ad1df921d
 EBUILD totem-3.12.1.ebuild 4442 SHA256 4e6e99257c5158874ae2c71c8dfd5e02c7a3dc6e6bc2dd982819469f6ee8b538 SHA512 72dc77a8466b55a47157e2ab3a9ac54a3f15a83b4ce909905ca43a7bb5c70c3f093089bd57d296697fd440cb18dbb9e2e4d938b7b22dfbe852a868d8e3af010e WHIRLPOOL 3ee7cf918da46f2f41d67495d18b580f47220e739bd4c7f3b4720e310351144502faa856cfaa3af384f36a491ba8f3cefe95857d3d95fe138b5172545758c764
-MISC ChangeLog 56635 SHA256 fc704f09187d892f8aa0f5a81068a0b5ab5380c026faf8b1a617cd30649433a1 SHA512 457163f4f27ce4edadf32fb17e3cc23fa634ff9b11f7a5b8bb7f0af7f4a382a2cae17ec0ef8b3de27dcf2993acbd7c9802b42c485138e91510c42dbb031b8bba WHIRLPOOL d35a8e780263d237e4be1631e5227511bf544d444d7baedfd08dca7e265785838da31cea48f90e51b83175616c2b1f6a08a56e47edf54618a299f4c6c1916dcf
-MISC metadata.xml 1542 SHA256 f20cc9630af8b7ba34b66ae995e734417ab8f4b1142eaf8458a6c385a6f85c1e SHA512 92ae20c93f396d8d1cbee93dbf48ee4bffcb67041ad9af0a4505eb7a0a8b181794da8dafdd575f7113f0d53ec39ccd5612223dc379ed8a25b0545a89b6e4c7fb WHIRLPOOL f64c55c6728a63e82624d895bc4127c7eb34e2d230d4f43007a5cbcc324aabb0184318185c3acf54322a454bb22d65e8392436f7f40c036a2369d8695e0e419d
+EBUILD totem-3.12.2.ebuild 4447 SHA256 b47bb659689e9c9423964fd3c6ce3e757f361044f1fe6ea9b04185bf6a53a553 SHA512 fa0299ff61943b5f7ea9f8e89333c812f91e07be14b9b586b90bd5e8b963ae910e28acc4f4772836aaa1fe900861dd8b61e6ffb4a152adb81c11b9672c814830 WHIRLPOOL 79ccfce5adce49bac8d18d35f2fff5436f99da6ed575f160dbaf6c25257948c2268b02bdef1e684713551c22e9b402c5aea823f83c4bfc511534455a3d094528
+MISC ChangeLog 56837 SHA256 9e8e0eec1aec916b6da932f879320c0eb026ef6b61f05fc22a602bfded438420 SHA512 583d8b9025f43e476349ab7ac70bef164dc21d4cd1300c088dec4737d205e6c7373c569a3fc33dedf37bca99c73b5aa0d4c2b8fda536ccd06d75767299c13cdd WHIRLPOOL 8d1ae4b4c543d62db8dc67ead5d503197e93582f7aa23ec42a4192aa922f4864baa30fed26a0b909c00eff2f7f5191eb6103a3d39784b526b403d0e81eacef1e
+MISC metadata.xml 1434 SHA256 58f77a11a8fe38bd753110fa028737c9a886b2f4b4e01881397fc740a55984b4 SHA512 8a9ab172d9e43479fd6f42f75df6a8e77232e382039be605d8eefb4ab32d82619d8c81e7890e767446c219ca090e28de02f007565db078f3ab4cbbbc933c8a99 WHIRLPOOL c48bbe1bf5a4f78e7c86d3e549ff8057a5ad2fd31e16cd2d99f20dc9492ae2033ad215353f3442503b4b76e0e46a28b0a6e04acb1d4eb5a6b08c890090fef0da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9NwAAoJELp701BxlEWfJdwP/RNvCqLYKrHWG1yC8tKo41Y4
-T9Xa3Jz1/ixPu0y/Ibq2GqoPe2SRM2eKaZOqhejU87uHqY9R8y3D9mtRM4vY70o8
-flEFxDWIFPFikoQtz3V5pACC4nQ3XoiBh0NJYLmS1HhbTbv+RAByZ+nebaT+IxpU
-wD2XjhVXSEeHU56qfb13t/kMk7GQ85AAZKi1lx63Wlh/im5zZa3AzdFjqtv4Fm3n
-DJ8WmzLWzte5M8u78KALYVkAQIp44lLQI0gi9gDdoHbDA7h7BOJYlggV0U+Opy96
-Tp+t+f78rELOF0cfqcUG+SRofRSdedWU9xZr9+oixzXkIpBH5fbzLoazM8uNlIxZ
-qStPRz8luuO+XhqpAwwX5lPvzrrFyg2z4MW+z8iwyc47H93PNw+W/TcB4VSwB9pt
-/ez30EqEFANo0dNvK+x+df5/hnzb+exLv8/8BBHTDAG0npJMRg4AvHcQpwOy06xB
-nIARtd4Io+VrXbqbt3fhy1HXskMZFxtIq8iMPjrzA5cm26kSWFhmqBndBAScUHWt
-CEvC3JqCSIyDipUKOgskgttTCip9mXXt/GPRxoh1+/STgNQQiBeemLuJuD/PJsxx
-VhMGrP0uM5uv2DA3STCWZtU4qZUTk2vItN3+r/NVEgYh/IdWlNdjB0klkdV6m6Io
-mw51BKcqg8UeEIdxty+e
-=zjyd
+iEYEAREIAAYFAlQIhmMACgkQCaWpQKGI+9QGLwCeM2164DLzpU2IL2ZuNZfCvfPa
+RIsAmgIMxCXBINLije2Eso3Bi7I1bDCj
+=02LL
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/files/totem-3.8.2-vimeo-compat.patch b/media-video/totem/files/totem-3.8.2-vimeo-compat.patch
deleted file mode 100644
index 789914a612a4..000000000000
--- a/media-video/totem/files/totem-3.8.2-vimeo-compat.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 6d233c27c2d2c3d415a1a1bdbedf0fe65f1f4434 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sat, 18 May 2013 13:31:01 +0000
-Subject: plugins: Add hack to allow streaming of Vimeo videos
-
-See http://thread.gmane.org/gmane.comp.web.flash.quvi/265/focus=268
----
-diff --git a/configure.ac b/configure.ac
-index 0810f01..be7e4e6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,7 +79,7 @@ AC_SUBST(TOTEM_API_VERSION)
- AC_DEFINE_UNQUOTED(TOTEM_API_VERSION, ["$TOTEM_API_VERSION"], [Define to the Totem plugin API version])
- 
- # The full list of plugins
--allowed_plugins="apple-trailers autoload-subtitles brasero-disc-recorder chapters dbusservice im-status gromit lirc media-player-keys ontop opensubtitles properties pythonconsole recent rotation save-file samplepython sample-vala screensaver screenshot sidebar-test skipto zeitgeist-dp grilo"
-+allowed_plugins="apple-trailers autoload-subtitles brasero-disc-recorder chapters dbusservice im-status gromit lirc media-player-keys ontop opensubtitles properties pythonconsole recent rotation save-file samplepython sample-vala screensaver screenshot sidebar-test skipto zeitgeist-dp grilo vimeo"
- 
- PLUGINDIR='${libdir}/totem/plugins'
- AC_SUBST(PLUGINDIR)
-@@ -739,6 +739,7 @@ src/plugins/brasero-disc-recorder/Makefile
- src/plugins/chapters/Makefile
- src/plugins/zeitgeist-dp/Makefile
- src/plugins/grilo/Makefile
-+src/plugins/vimeo/Makefile
- src/backend/Makefile
- browser-plugin/Makefile
- data/Makefile
-diff --git a/src/plugins/vimeo/Makefile.am b/src/plugins/vimeo/Makefile.am
-new file mode 100644
-index 0000000..17a3892
---- /dev/null
-+++ b/src/plugins/vimeo/Makefile.am
-@@ -0,0 +1,13 @@
-+include $(top_srcdir)/src/plugins/Makefile.plugins
-+
-+plugindir = $(PLUGINDIR)/vimeo
-+plugin_LTLIBRARIES = libvimeo.la
-+
-+plugin_in_files = vimeo.plugin.in
-+
-+libvimeo_la_SOURCES = totem-vimeo.c
-+libvimeo_la_LDFLAGS = $(plugin_ldflags)
-+libvimeo_la_LIBADD = $(plugin_libadd)
-+libvimeo_la_CFLAGS = $(plugin_cflags)
-+
-+-include $(top_srcdir)/git.mk
-diff --git a/src/plugins/vimeo/totem-vimeo.c b/src/plugins/vimeo/totem-vimeo.c
-new file mode 100644
-index 0000000..b7074e9
---- /dev/null
-+++ b/src/plugins/vimeo/totem-vimeo.c
-@@ -0,0 +1,81 @@
-+/*
-+ *  Copyright (C) 2013 Bastien Nocera <hadess@hadess.net>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program 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 General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
-+ *
-+ *
-+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
-+ * plugins to be used and distributed together with GStreamer and Totem. This
-+ * permission are above and beyond the permissions granted by the GPL license
-+ * Totem is covered by.
-+ *
-+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
-+ * See license_change file for details.
-+ *
-+ */
-+
-+
-+#include "config.h"
-+
-+#include <glib-object.h>
-+
-+#include "totem-plugin.h"
-+#include "totem.h"
-+
-+#define TOTEM_TYPE_VIMEO_PLUGIN	(totem_vimeo_plugin_get_type ())
-+#define TOTEM_VIMEO_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_VIMEO_PLUGIN, TotemVimeoPlugin))
-+
-+typedef struct {
-+	guint signal_id;
-+	TotemObject *totem;
-+} TotemVimeoPluginPrivate;
-+
-+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_VIMEO_PLUGIN, TotemVimeoPlugin, totem_vimeo_plugin)
-+
-+static char *
-+get_user_agent_cb (TotemObject *totem,
-+		   const char  *mrl)
-+{
-+	if (g_str_has_prefix (mrl, "http://vimeo.com") ||
-+	    g_str_has_prefix (mrl, "http://player.vimeo.com"))
-+		return g_strdup ("Mozilla/5.0");
-+	return NULL;
-+}
-+
-+static void
-+impl_activate (PeasActivatable *plugin)
-+{
-+	TotemVimeoPlugin *pi = TOTEM_VIMEO_PLUGIN (plugin);
-+
-+	pi->priv->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
-+	pi->priv->signal_id = g_signal_connect (G_OBJECT (pi->priv->totem), "get-user-agent",
-+						G_CALLBACK (get_user_agent_cb), NULL);
-+}
-+
-+static void
-+impl_deactivate (PeasActivatable *plugin)
-+{
-+	TotemVimeoPlugin *pi = TOTEM_VIMEO_PLUGIN (plugin);
-+
-+	if (pi->priv->signal_id) {
-+		g_signal_handler_disconnect (pi->priv->totem, pi->priv->signal_id);
-+		pi->priv->signal_id = 0;
-+	}
-+
-+	if (pi->priv->totem) {
-+		g_object_unref (pi->priv->totem);
-+		pi->priv->totem = NULL;
-+	}
-+}
-diff --git a/src/plugins/vimeo/vimeo.plugin.in b/src/plugins/vimeo/vimeo.plugin.in
-new file mode 100644
-index 0000000..f18b6eb
---- /dev/null
-+++ b/src/plugins/vimeo/vimeo.plugin.in
-@@ -0,0 +1,9 @@
-+[Plugin]
-+Module=vimeo
-+IAge=1
-+Builtin=true
-+_Name=Vimeo
-+_Description=Sets the user agent for the Vimeo site
-+Authors=Bastien Nocera
-+Copyright=Copyright © 2013 Bastien Nocera
-+Website=http://www.gnome.org/projects/totem/
---
-cgit v0.9.2
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index bd5d5432ff73..c2cf874a35b8 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -12,8 +12,6 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
 			user's bluetooth handset using <pkg>net-wireless/bluez</pkg></flag>
 		<flag name="flash">Install browser plugin for playing embedded Adobe Flash
 			videos. Warning: breaks non-video Flash objects on many websites.</flag>
-		<flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
-			from various sources</flag>
 		<flag name="iplayer">Enable BBC player support</flag>
 		<flag name="lirc">Enable support for controlling Totem with a remote control
 			using <pkg>app-misc/lirc</pkg></flag>
diff --git a/media-video/totem/totem-3.10.1.ebuild b/media-video/totem/totem-3.12.2.ebuild
index 71c468268a71..4cb7683a2700 100644
--- a/media-video/totem/totem-3.10.1.ebuild
+++ b/media-video/totem/totem-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.10.1.ebuild,v 1.7 2014/06/16 11:32:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.12.2.ebuild,v 1.1 2014/09/04 15:33:53 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -11,11 +11,11 @@ PYTHON_REQ_USE="threads"
 inherit autotools eutils gnome2 multilib python-single-r1
 
 DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+IUSE="flash +introspection lirc nautilus nsplugin +python test zeitgeist"
 # see bug #359379
 REQUIRED_USE="
 	flash? ( nsplugin )
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	zeitgeist? ( introspection )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup to test it
@@ -32,22 +32,22 @@ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 # Automagic tracker-0.9.0
 # Runtime dependency on gnome-session-2.91
 RDEPEND="
-	>=dev-libs/glib-2.33:2
+	>=dev-libs/glib-2.35:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.10:3[introspection?]
-	>=dev-libs/totem-pl-parser-3.9.92:0=[introspection?]
+	>=x11-libs/gtk+-3.11.5:3[introspection?]
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
 	>=dev-libs/libpeas-1.1.0[gtk]
-	>=x11-themes/gnome-icon-theme-2.16
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6:2
-	>=media-libs/clutter-1.10:1.0
+	>=media-libs/clutter-1.17.3:1.0[gtk]
 	>=media-libs/clutter-gst-1.5.5:2.0
-	>=media-libs/clutter-gtk-1.0.2:1.0
+	>=media-libs/clutter-gtk-1.5.2:1.0
 	x11-libs/mx:1.0
 
-	media-libs/gstreamer:1.0
+	>=media-libs/grilo-0.2.10:0.2[playlist]
+	media-plugins/grilo-plugins:0.2
+	>=media-libs/gstreamer-1.2.4:1.0
 	media-libs/gst-plugins-base:1.0[X,introspection?,pango]
-	>=media-libs/gst-plugins-bad-1.0.2:1.0
 	media-libs/gst-plugins-good:1.0
 	media-plugins/gst-plugins-taglib:1.0
 	media-plugins/gst-plugins-meta:1.0
@@ -61,15 +61,10 @@ RDEPEND="
 	x11-themes/gnome-icon-theme-symbolic
 
 	flash? ( dev-libs/totem-pl-parser[quvi] )
-	grilo? (
-		media-libs/grilo:0.2
-		media-plugins/grilo-plugins:0.2 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	lirc? ( app-misc/lirc )
 	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	nsplugin? (
-		>=dev-libs/dbus-glib-0.82
-		>=x11-misc/shared-mime-info-0.22 )
+	nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
@@ -82,6 +77,7 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.5
 	app-text/scrollkeeper
 	app-text/yelp-tools
+	dev-util/appdata-tools
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
@@ -98,6 +94,7 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common
 # docbook-xml-dtd is needed for user doc
 # Prevent dev-python/pylint dep, bug #482538
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -123,8 +120,7 @@ src_configure() {
 	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
 	plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
 	plugins+=",properties,recent,rotation,screensaver,screenshot"
-	plugins+=",sidebar-test,skipto,vimeo"
-	use grilo && plugins+=",grilo"
+	plugins+=",skipto,vimeo"
 	use lirc && plugins+=",lirc"
 	use nautilus && plugins+=",save-file"
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
@@ -137,7 +133,6 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-run-in-source-tree \
 		--disable-static \
-		--with-smclient=auto \
 		--enable-easy-codec-installation \
 		--enable-vala \
 		$(use_enable flash vegas-plugin) \