diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
new file mode 100644
index 0000000..1b0aae9
--- /dev/null
+++ b/media-plugins/grilo-plugins/Manifest
@@ -0,0 +1,6 @@
+AUX grilo-plugins-0.2.13-0001-fix-thumbnail-url-not-getting-saved.patch 951 SHA256 2dcef59792923b7d7bc38a15663d1aec5422b3a0aac997cf529dad8847f2d5ad SHA512 738ddaded6dd3c94afb8e264e3db74705e33bc77ce23d55c92ccbb04fddaa5c381da7c91e5ebc64031b59625c39351d3dc7f61c25e968df1766703aa699a454b WHIRLPOOL 3a907899d9087e5c86ab4ebb3539217d426b9ac2e55f864173932c5e214a4bd9d1fb16d840e237a68d197d336fab0d4b4c767497b07b86ef75cb8fcbb5e49551
+AUX grilo-plugins-0.2.13-0002-fix-updating-bookmarks.patch 2564 SHA256 37df6f0b71fe7568f0e1d70c3f7255fc8ec1a01fdce2a5b8ee56b99570009c36 SHA512 3aee7600233a0121eaa6374fb1c6d0cf392a389556adcb552b48e1b0c2c057faccb8af530a34f6f4b9eb9a78596ab7b13b1684f65600390a791a5d813b2267e1 WHIRLPOOL ff094806beaa1f872970c2f8b4eaa4b9f7f39a84706ca717895db4a156e32d88ea7b8583c13fef097ec67d324d7d468b53f82a1138793ae03d5403e8cf1e46ca
+AUX grilo-plugins-0.2.13-0003-tracker-correctly-set-title-from-filename.patch 3137 SHA256 be6a790a2e471cf19eafc2c342c485a0309f92a6ce5427697e51163235a6ecc8 SHA512 262d38db699383ea20604cf1fb7f9a41de6bdbb15cdc5cc17ef2c51635e6f9b07f443113850898f3aaa96dd0c54c40a472b8c93d1dd53b8a58cdec88234aa1e1 WHIRLPOOL 92fb483c90ee2645baafcbccbecf4dd877e26fca933697635b0144be2ebea1ec4806302adb13fff033637d03753ad010cef489ef08047aae215e476ddd334686
+AUX grilo-plugins-0.2.13-0004-bookmarks-only-emit-item-removed-if-actually-removed.patch 791 SHA256 4ebb1f7701dc9acaa044e3d0f015ebf77fa1a9b826cd77c201a959edf08af435 SHA512 806ed275a3dbea1470953fa2cacff8a829e894bcd5175b3fbd8ec067a6ffa8ccf01fab3bea13217ddff8621b0b8e158c8c24fc37bb0ad1cab1b45438f86f4e2e WHIRLPOOL 70e62a010a9d351de898a9eeb48f00b4b093b373f4fd0d69286123ce87ee497fb0fb0b1db62b6576042a36fba66db137e51170f44951a8c735a87c602399d5e6
+DIST grilo-plugins-0.2.13.tar.xz 999896 SHA256 a5544831ba81a4e7caea30da89874fd20142a362d389366e1113d0e64be51201 SHA512 5ec97ea16fc13c13090d58067bc982176967f49b7f996b2ee75fe2c915bfdaf96fb780730b9aeca3ba1e7d566526b7c7423a238b0285b0f60b97ad66b1cb0e03 WHIRLPOOL ef0cadaf229d02083efe6375db2ef335b88b9f46a29d671713957625868a30294952e538cb280de387d5078823ebd2f6d80ddb76d2ebed81008d53b44d3e62f5
+EBUILD grilo-plugins-0.2.13-r1.ebuild 2834 SHA256 4c296985fb86d5193c6228215fb0d634bb3040f5b5d2443b03322778fe936ff9 SHA512 a24fb0901a627a9730755655e0198a48482edd13224ccb34b879723a534f2a0e4527a68ebed47a8c862587f00601befa3e43193ac068199d20fd26cb8db1e546 WHIRLPOOL 676705cee8a34948a2812d44f8d510aab045d45f38b29ad5210522e46ed1d4634611d3f03a7b8340186cb6d7135de0b7562cebbf799cb686628dda1a50979b85
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0001-fix-thumbnail-url-not-getting-saved.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0001-fix-thumbnail-url-not-getting-saved.patch
new file mode 100644
index 0000000..9faaaf7
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0001-fix-thumbnail-url-not-getting-saved.patch
@@ -0,0 +1,24 @@
+From 734936dbe166526a1e2ebdc1ffebbab64b2216ee Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 14 Oct 2014 19:30:36 +0200
+Subject: bookmarks: Fix thumbnail URL not getting saved
+
+A cut'n'paste error meant that we saved the description instead of
+the thumbnail URL in that field.
+
+diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
+index d2b4797..b6b49f6 100644
+--- a/src/bookmarks/grl-bookmarks.c
++++ b/src/bookmarks/grl-bookmarks.c
+@@ -718,7 +718,7 @@ store_bookmark (GrlBookmarksSource *bookmarks_source,
+                               GRLKEYID_TO_POINTER (GRL_METADATA_KEY_DESCRIPTION));
+   }
+   if (thumb) {
+-    g_object_set (G_OBJECT (resource), "thumbnail-url", desc, NULL);
++    g_object_set (G_OBJECT (resource), "thumbnail-url", thumb, NULL);
+     *keylist = g_list_remove (*keylist,
+                               GRLKEYID_TO_POINTER (GRL_METADATA_KEY_THUMBNAIL));
+   }
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0002-fix-updating-bookmarks.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0002-fix-updating-bookmarks.patch
new file mode 100644
index 0000000..79b20c6
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0002-fix-updating-bookmarks.patch
@@ -0,0 +1,76 @@
+From a85c242337e90eef5bc9fa272f8f43853deae322 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 14 Oct 2014 19:32:10 +0200
+Subject: bookmarks: Fix updating bookmarks
+
+Our use of gom meant that we always ended up with a new item instead of
+updating an existing one. We need to load the item from the DB to be
+able to offer that.
+
+diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
+index b6b49f6..77ff593 100644
+--- a/src/bookmarks/grl-bookmarks.c
++++ b/src/bookmarks/grl-bookmarks.c
+@@ -635,6 +635,31 @@ remove_bookmark (GrlBookmarksSource *bookmarks_source,
+   }
+ }
+ 
++static GomResource *
++find_resource (const gchar   *id,
++	       GomRepository *repository)
++{
++  GomResource *resource;
++  GomFilter *filter;
++  GValue value = { 0, };
++
++  if (id == NULL)
++    return NULL;
++
++  g_value_init(&value, G_TYPE_INT64);
++  g_value_set_int64 (&value, g_ascii_strtoll (id, NULL, 0));
++  filter = gom_filter_new_eq (BOOKMARKS_TYPE_RESOURCE, "id", &value);
++  g_value_unset(&value);
++
++  resource = gom_repository_find_one_sync (repository,
++                                           BOOKMARKS_TYPE_RESOURCE,
++                                           filter,
++                                           NULL);
++  g_object_unref (filter);
++
++  return resource;
++}
++
+ static void
+ store_bookmark (GrlBookmarksSource *bookmarks_source,
+                 GList **keylist,
+@@ -659,6 +684,7 @@ store_bookmark (GrlBookmarksSource *bookmarks_source,
+ 
+   GRL_DEBUG ("store_bookmark");
+ 
++  str_id = (gchar *) grl_media_get_id (bookmark);
+   title = grl_media_get_title (bookmark);
+   url = grl_media_get_url (bookmark);
+   thumb = grl_media_get_thumbnail (bookmark);
+@@ -684,11 +710,14 @@ store_bookmark (GrlBookmarksSource *bookmarks_source,
+     type = BOOKMARK_TYPE_STREAM;
+   }
+ 
+-  resource = g_object_new (BOOKMARKS_TYPE_RESOURCE,
+-                           "repository", bookmarks_source->priv->repository,
+-                           "parent", parent_id,
+-                           "type", type,
+-                           NULL);
++  resource = find_resource (str_id, bookmarks_source->priv->repository);
++  if (!resource) {
++    resource = g_object_new (BOOKMARKS_TYPE_RESOURCE,
++                             "repository", bookmarks_source->priv->repository,
++                             "parent", parent_id,
++                             "type", type,
++                             NULL);
++  }
+ 
+   if (type == BOOKMARK_TYPE_STREAM) {
+     g_object_set (G_OBJECT (resource), "url", url, NULL);
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0003-tracker-correctly-set-title-from-filename.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0003-tracker-correctly-set-title-from-filename.patch
new file mode 100644
index 0000000..86b9347
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0003-tracker-correctly-set-title-from-filename.patch
@@ -0,0 +1,85 @@
+From ff9afc6bb2d6515c773a77b1d8ed1a985a635b17 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 26 Nov 2014 15:45:39 +0100
+Subject: tracker: Correctly set "title-from-filename"
+
+Tracker usually provides us with a title that's derived from the
+filename. Replicate its process to create a title from a filename
+to check if the title is actually set from the filename.
+
+This allows the local-metadata plugin to parse it to remove gunk, and
+other plugins to override its throwaway title.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740756
+
+diff --git a/src/tracker/grl-tracker-source-api.c b/src/tracker/grl-tracker-source-api.c
+index 8c9fd55..fbc69a3 100644
+--- a/src/tracker/grl-tracker-source-api.c
++++ b/src/tracker/grl-tracker-source-api.c
+@@ -203,6 +203,39 @@ static GHashTable *grl_tracker_operations;
+ /**/
+ 
+ static void
++set_title_from_filename (GrlMedia *media)
++{
++  const gchar *url;
++  gchar *path, *display_name, *ext, *title;
++  guint suffix_len;
++
++  url = grl_media_get_url (media);
++  if (url == NULL)
++    return;
++
++  path = g_filename_from_uri (url, NULL, NULL);
++  if (!path)
++    return;
++  display_name = g_filename_display_basename (path);
++  g_free (path);
++  ext = strrchr (display_name, '.');
++  if (!ext)
++    goto out;
++
++  suffix_len = strlen (ext);
++  if (suffix_len != 4 && suffix_len != 5)
++    goto out;
++
++  title = g_strndup (display_name, ext - display_name);
++  if (g_strcmp0 (grl_media_get_title (media), title) == 0)
++    grl_data_set_boolean (GRL_DATA (media), GRL_METADATA_KEY_TITLE_FROM_FILENAME, TRUE);
++  g_free (title);
++
++out:
++  g_free (display_name);
++}
++
++static void
+ fill_grilo_media_from_sparql (GrlTrackerSource    *source,
+                               GrlMedia            *media,
+                               TrackerSparqlCursor *cursor,
+@@ -402,6 +435,7 @@ get_sparql_type_filter (GrlOperationOptions *options,
+         fill_grilo_media_from_sparql (GRL_TRACKER_SOURCE (spec->source), \
+                                       media, os->cursor, col);          \
+       }                                                                 \
++      set_title_from_filename (media);                                  \
+                                                                         \
+       spec->callback (spec->source,                                     \
+                       spec->operation_id,                               \
+@@ -507,6 +541,7 @@ tracker_resolve_cb (GObject      *source_object,
+       fill_grilo_media_from_sparql (GRL_TRACKER_SOURCE (rs->source),
+                                     rs->media, cursor, col);
+     }
++    set_title_from_filename (rs->media);
+ 
+     rs->callback (rs->source, rs->operation_id, rs->media, rs->user_data, NULL);
+   } else {
+@@ -565,6 +600,7 @@ tracker_media_from_uri_cb (GObject      *source_object,
+       fill_grilo_media_from_sparql (GRL_TRACKER_SOURCE (mfus->source),
+                                     media, cursor, col);
+     }
++    set_title_from_filename (media);
+ 
+     mfus->callback (mfus->source, mfus->operation_id, media, mfus->user_data, NULL);
+   } else {
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0004-bookmarks-only-emit-item-removed-if-actually-removed.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0004-bookmarks-only-emit-item-removed-if-actually-removed.patch
new file mode 100644
index 0000000..a7e6b6b
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/grilo-plugins-0.2.13-0004-bookmarks-only-emit-item-removed-if-actually-removed.patch
@@ -0,0 +1,22 @@
+From ae10b48dff54a07ea638421554cab207b8bb1ced Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 2 Dec 2014 18:28:39 +0100
+Subject: bookmarks: Only emit "item removed" if actually removed
+
+
+diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
+index 46e9c30..c7f0109 100644
+--- a/src/bookmarks/grl-bookmarks.c
++++ b/src/bookmarks/grl-bookmarks.c
+@@ -631,7 +631,7 @@ remove_bookmark (GrlBookmarksSource *bookmarks_source,
+ 
+   g_object_unref (resource);
+ 
+-  if (bookmarks_source->priv->notify_changes) {
++  if (*error != NULL && bookmarks_source->priv->notify_changes) {
+     /* We can improve accuracy computing the parent container of removed
+        element */
+     grl_source_notify_change (GRL_SOURCE (bookmarks_source),
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.13-r1.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.13-r1.ebuild
new file mode 100644
index 0000000..b3985e2
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.13-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.2.13.ebuild,v 1.6 2015/02/23 11:59:50 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="daap +dvd flickr freebox gnome-online-accounts lua pocket thetvdb tracker upnp-av +vimeo +youtube"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=media-libs/grilo-0.2.11:${SLOT}[network,playlist]
+	>=media-libs/libmediaart-0.1
+	>=dev-libs/gom-0.2.1
+
+	dev-libs/gmime:2.6
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	dev-db/sqlite:3
+
+	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
+	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
+	flickr? ( net-libs/liboauth )
+	freebox? ( net-dns/avahi )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+	lua? (
+		>=dev-lang/lua-5.2
+		app-arch/libarchive )
+	pocket? (
+		>=net-libs/gnome-online-accounts-3.11.4
+		>=net-libs/rest-0.7.90
+		>=dev-libs/totem-pl-parser-3.4.1 )
+	thetvdb? (
+		app-arch/libarchive
+		dev-libs/libxml2 )
+	tracker? ( >=app-misc/tracker-0.10.5:= )
+	youtube? (
+		>=dev-libs/libgdata-0.9.1:=
+		dev-libs/totem-pl-parser )
+	upnp-av? ( net-libs/libsoup )
+	vimeo? (
+		dev-libs/totem-pl-parser )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_prepare() {
+
+    epatch "${FILESDIR}/${P}-0001-fix-thumbnail-url-not-getting-saved.patch"
+    epatch "${FILESDIR}/${P}-0002-fix-updating-bookmarks.patch"
+    epatch "${FILESDIR}/${P}-0003-tracker-correctly-set-title-from-filename.patch"
+    epatch "${FILESDIR}/${P}-0004-bookmarks-only-emit-item-removed-if-actually-removed.patch"
+
+    gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-debug only changes CFLAGS, useless for us
+	# Plugins
+	# shoutcast seems to be broken
+	gnome2_src_configure \
+		--disable-static \
+		--disable-debug \
+		--disable-uninstalled \
+		--enable-bliptv \
+		--enable-apple-trailers \
+		--enable-bookmarks \
+		--enable-filesystem \
+		--enable-gravatar \
+		--enable-jamendo \
+		--enable-lastfm-albumart \
+		--enable-localmetadata \
+		--enable-magnatune \
+		--enable-metadata-store \
+		--enable-podcasts \
+		--enable-raitv \
+		--disable-shoutcast \
+		--enable-tmdb \
+		$(use_enable daap dmap) \
+		$(use_enable dvd optical-media) \
+		$(use_enable flickr) \
+		$(use_enable freebox) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable lua lua-factory) \
+		$(use_enable pocket) \
+		$(use_enable thetvdb) \
+		$(use_enable tracker) \
+		$(use_enable upnp-av dleyna) \
+		$(use_enable vimeo) \
+		$(use_enable youtube)
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
new file mode 100644
index 0000000..2b0df8d
--- /dev/null
+++ b/media-video/totem/Manifest
@@ -0,0 +1,12 @@
+AUX totem-3.14.2-0001-bump-required-grilo-version.patch 579 SHA256 78551cef79aada77233d5b0caa44b8cae44a5ab514227701c3853db444b266e9 SHA512 deaad1eecc2a4d2cac3d19bdc045878e8bbcfcdbe02bff4ddd409fe683118c50d1970348221a7b8d74cf233e134b1fb921fd365cbaa29f36246ed1b4a1eb3c5d WHIRLPOOL 1937254a7a276f727b1bd0c6ccb23bbc84ef930e38fdf2a776084b33f65e6c5031498002c99da19461739c2e4dcc29fec6da707126e25e58d9e5459f136698c8
+AUX totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch 2786 SHA256 317212cdd0896d39617e967794db94a214fe4672cf8aeb97c9656d99d18f45e9 SHA512 b60a04ba78a8008542bbd1bcaad57acd265821ad2d34f16daaf6d1c3337789fd4a699e41088de238ae30291b1b64986de28ea712a7b5c4b04c27b0b05b349df2 WHIRLPOOL f24809b3899b2dd65526aa967a9e2e4ceeaa9326ddebc768760aa748c11827148bb351b84478e213cf0adac8c0c133be939f921f435c5fcbbf77df234f999da1
+AUX totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch 994 SHA256 866c7cffdb66e341aa040dc7823262ffd3eadb806d41059ada0abfbebded48cb SHA512 518644132440aa35bc45ef2783710dbabcd65aca2e716325bd1fbd9377556a1c6229803ded08dc9431e8642637ad1b44ab6b39407523679eee36a388f1e6d61c WHIRLPOOL 64d3cbd769417db51ad969e3abf3318fda0ff4443b4a9a46f80622deba8cc0b03ab567c2ff1920ea804220414b0100b9b6a8505f12cd0abbb2855f7a4a3bfafe
+AUX totem-3.14.2-0004-don-t-monitor-tracker.patch 752 SHA256 f439fb5a7ef87217bebdf8228e28509e2822ed51853856f71ea03417d765db72 SHA512 797ff8ee777673054bb38e2a6b53874e8b09949243b8310ac811cb514e5712d11658b33ed2037f52b51519b84abe4dd2392860ab6e7f1ceb7b1a987b418bd7d3 WHIRLPOOL 5913d027f651bda38cbb6724db27ac79de7c5555da383e1a02d2cc7c220b7303fd4fb39c21429488f5b4021fb6249cc4c27698f25eb83976646362be34aefcf5
+AUX totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch 847 SHA256 b19a58535ed40c1f0d020fd3a2d4624ec5285ca23367684ae13b22e193a55301 SHA512 0019219e0a398439a48d80deffa99595199b82992faaafab92bb516de8aa1cced792a7654130581ea6a7633102361ea5f212371c1eff5e2781724a5e8a062016 WHIRLPOOL fed0d922aa4525918cf9132e769bea7a3c996f64e62b927697ec2544210467526a7aede0030bce07bbfb9d87d666020b212fe20aeb8d1ffb80f8b0c5d1887656
+AUX totem-3.14.2-0006-add-debug-statements.patch 839 SHA256 ffe6a457573b5e9642d652ee181a855dcafe40683e1163a5b9e487c648f36736 SHA512 f7d33952c8c11a7b671ba4cd8c3f8282ed6e6f333f2aaf5065ecca677a54679653338e0f2bb3f1a16992f2379f851c917a4f51695bd4f4be99f3a58903b06ea4 WHIRLPOOL cd35f14fd7883e2edbdb3bb744551927e779e3a48ad5397f7346fecf16e6d8a6f0647ae71c3cdd59324f5dd9cc34f3709d6a0eabab363154d600abe1463c38d2
+AUX totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch 3044 SHA256 705219a4a89591d413b02bf2dcdebd1eabea277dd2e739c89e3ef8ca4d29a806 SHA512 9943e82330a12bca51cff1edabfc8e48f4c24217d9035f2ced98dd9f7c6fe4a2b7c5913dcbcf1b19b74f7a2424441b9b62327ee49edf6eb0cc3caa61907da213 WHIRLPOOL 7e3535ef8ae8f4690a327c6195d8cd776f982facfda8f2dd9fba70eb87e0231277c3f23659e3c72244970ab8294424952493b86cb4dde59e5fe77a57678edf85
+AUX totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch 733 SHA256 40cf9cd663856135081fc2e7c009056657f6d67f9a512cbc15c7bf0634ab3805 SHA512 0e3a8b729c77e7e6a10c0f1c01ce7ac2189e6357385ba7f0c6fe9cc5921e353bdd299834fb428bf8cfcae0bfdfa2ab8e0f145d54d4433946c10963e14eb15fa1 WHIRLPOOL 3fededbc961ed6ccef17ba0efa4ce294d80a40e6280a44ca9a103f190b824853c6c558f190ef30d86a320c5b3162b5ec9060f9b70c97af45585d7ec5c6c6a409
+AUX totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch 1403 SHA256 ff80ae81f55fab9b197f9bae25d6bff88f7f9c67c2e73165fdca07d50acb5685 SHA512 4815c6a3066130b2beeed9144a628217663f9a4ce2c815555d442ed4dbd853bce4a0d58eb180b7aac88421e09547fde277474d1b46aacafc98bd28add35c03d9 WHIRLPOOL d5b616ce725881c3c5ce1b544e389e9542d0009a60ad67d20fd629e5bd9efd196fe63192802d46d404570fad198a111e56a3aab9a77add49b7762992ed65e79a
+AUX totem-3.14.2-0010-fix-detection-of-valac.patch 1026 SHA256 ffbae986072906a34ebdcf3ee07a2f7a2d72746e4269a676ddc811b52321d6ea SHA512 517e20777075daa99e5602478e77001aa333a4bc58ade9e13d354c3d43d082f1805e20c6d9658b5dde7109bdf072b2b62fe7cb8dab29fffe9c78da05ec8ea569 WHIRLPOOL 5450d66c5a3fb350be13c90ff5456a38aa43a22ae023da33df93b4c852b6b79200fd39f825bbd8acf563886d9a45ad5615a544f0bd8fc6d668a6ac7043407007
+DIST totem-3.14.2.tar.xz 3240668 SHA256 967dcf3070365a82873e5bc678299d5fb058f87f151d1e22d60313fab2ac09cc SHA512 bff15cbeb59ecfd03177c4630f8eda257ff386f3b2da933c164765ec2bd5373374e0389a46701fb97df3d57718e0c9af446c3f3cc748a956abad066008a7d17b WHIRLPOOL 5ab04a55f5d35b8a11d90dea0ea33630d3e53aa0030965114e69b4c031440f1df7f47829d4fb1953f55f30d9aa97d1e4ef694d4567297ccebff46879fd14268b
+EBUILD totem-3.14.2-r1.ebuild 4774 SHA256 9e32f17b27b62074c225b74e1ca536e08e871ceb15bb8abfd8afa540b9bc9805 SHA512 3ae8aa1299edfec7bc7faf0c280c8c2be5bee28bc3dba9bc3589d14b9eb6cef386b37067b4bcc2b0bbaa5f0955a05f6bf9f98195fdcb60d4149bc0af6156c6af WHIRLPOOL 47d83cdb9b714ab3f3785e7fdafc49048ea3f512938b651d056fb5422667fc828dd98eb9d88ba21b26accff9e8e5ddb5e582c7d749574d434a35fb995d453319
diff --git a/media-video/totem/files/totem-3.14.2-0001-bump-required-grilo-version.patch b/media-video/totem/files/totem-3.14.2-0001-bump-required-grilo-version.patch
new file mode 100644
index 0000000..3d96da0
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0001-bump-required-grilo-version.patch
@@ -0,0 +1,23 @@
+From ef3da6bbf05dfdc8d0c289f3134b67f3eea925e9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 11 Feb 2015 11:49:47 +0100
+Subject: build: Bump required grilo for GRL_METADATA_KEY_TITLE_FROM_FILENAME
+
+https://bugzilla.gnome.org/show_bug.cgi?id=744315
+
+diff --git a/configure.ac b/configure.ac
+index 65e3069..20ec003 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,7 @@ VALA_REQS=0.14.1
+ PEAS_REQS=1.1.0
+ PYTHON_REQS=2.3
+ PYGOBJECT_REQS=2.90.3
+-GRILO_REQS=0.2.10
++GRILO_REQS=0.2.11
+ GRILO_PLS_REQS=0.2.1
+ LIBXML_REQS=2.6.0
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch b/media-video/totem/files/totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch
new file mode 100644
index 0000000..e4b079b
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch
@@ -0,0 +1,83 @@
+From ea29374ebcdb0877832f6eeb61451571bb13bdc4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 22 Apr 2015 13:28:38 +0200
+Subject: main: Fix (again) doubling files added on the cmd line
+
+When handling local command-line options, we would process all the
+options and send them as "remote" commands through totem. But the
+"remote-command" action would activate the application first. Thus we
+would do something like:
+- process command-line options in totem_object_app_handle_local_options()
+which calls totem_options_process_for_server(), which sends out
+"remote-command" actions
+- when handling "remote-command", to make sure that the application is
+actually ready, we call "activate".
+- but we didn't clear the filenames struct member in optionstate, so we
+process it again in "activate"
+
+With help from Carlos Maddela <maddela@labyrinth.net.au>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740995
+
+diff --git a/src/totem-options.c b/src/totem-options.c
+index f48bf74..daba578 100644
+--- a/src/totem-options.c
++++ b/src/totem-options.c
+@@ -78,11 +78,12 @@ totem_send_remote_command (Totem              *totem,
+ }
+ 
+ void
+-totem_options_process_for_server (Totem                     *totem,
+-				  const TotemCmdLineOptions *options)
++totem_options_process_for_server (Totem               *totem,
++				  TotemCmdLineOptions *options)
+ {
+ 	TotemRemoteCommand action;
+ 	GList *commands, *l;
++	char **filenames;
+ 	int i;
+ 
+ 	commands = NULL;
+@@ -103,12 +104,15 @@ totem_options_process_for_server (Totem                     *totem,
+ 		action = TOTEM_REMOTE_COMMAND_ENQUEUE;
+ 	}
+ 
++	filenames = options->filenames;
++	options->filenames = NULL;
++
+ 	/* Send the files to enqueue */
+-	for (i = 0; options->filenames && options->filenames[i] != NULL; i++) {
++	for (i = 0; filenames && filenames[i] != NULL; i++) {
+ 		const char *filename;
+ 		char *full_path;
+ 
+-		filename = options->filenames[i];
++		filename = filenames[i];
+ 		full_path = totem_create_full_path (filename);
+ 
+ 		totem_send_remote_command (totem, action, full_path ? full_path : filename);
+@@ -122,6 +126,8 @@ totem_options_process_for_server (Totem                     *totem,
+ 		}
+ 	}
+ 
++	g_clear_pointer (&filenames, g_strfreev);
++
+ 	if (options->playpause) {
+ 		commands = g_list_append (commands, GINT_TO_POINTER
+ 					  (TOTEM_REMOTE_COMMAND_PLAYPAUSE));
+diff --git a/src/totem-options.h b/src/totem-options.h
+index cdc3888..662b775 100644
+--- a/src/totem-options.h
++++ b/src/totem-options.h
+@@ -55,7 +55,7 @@ extern TotemCmdLineOptions optionstate;
+ 
+ void totem_options_register_remote_commands (Totem *totem);
+ void totem_options_process_for_server (Totem *totem,
+-				       const TotemCmdLineOptions* options);
++				       TotemCmdLineOptions* options);
+ 
+ G_END_DECLS
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch b/media-video/totem/files/totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch
new file mode 100644
index 0000000..21d110b
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch
@@ -0,0 +1,31 @@
+From dc35bff8a374ba1cf28212a79e15609f7acfdcd3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 29 Mar 2015 15:22:18 +0200
+Subject: grilo: Simplify test whether to monitor a source
+
+A little bit cleaner.
+
+diff --git a/src/totem-grilo.c b/src/totem-grilo.c
+index 7408a9b..20580dd 100644
+--- a/src/totem-grilo.c
++++ b/src/totem-grilo.c
+@@ -1297,12 +1297,12 @@ source_added_cb (GrlRegistry *registry,
+ 							   MODEL_RESULTS_IS_PRETHUMBNAIL, TRUE,
+ 							   MODEL_RESULTS_CAN_REMOVE, can_remove (source, NULL),
+ 							   -1);
+-			monitor = TRUE;
++
++			if (g_str_equal (id, "grl-filesystem") == FALSE)
++				monitor = TRUE;
+ 		}
+ 
+-		if (monitor &&
+-		    (ops & GRL_OP_NOTIFY_CHANGE) &&
+-		    g_str_equal (id, "grl-filesystem") == FALSE) {
++		if (monitor && (ops & GRL_OP_NOTIFY_CHANGE)) {
+ 			grl_source_notify_change_start (source, NULL);
+ 			g_signal_connect (G_OBJECT (source), "content-changed",
+ 					  G_CALLBACK (content_changed_cb), self);
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0004-don-t-monitor-tracker.patch b/media-video/totem/files/totem-3.14.2-0004-don-t-monitor-tracker.patch
new file mode 100644
index 0000000..fb811bc
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0004-don-t-monitor-tracker.patch
@@ -0,0 +1,25 @@
+From c56350fa481667837c4d2cb64d63217dea8a2b82 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 29 Mar 2015 15:22:53 +0200
+Subject: grilo: Don't monitor tracker
+
+See also:
+https://bugzilla.gnome.org/show_bug.cgi?id=746974
+
+diff --git a/src/totem-grilo.c b/src/totem-grilo.c
+index 20580dd..733d9c9 100644
+--- a/src/totem-grilo.c
++++ b/src/totem-grilo.c
+@@ -1282,7 +1282,8 @@ source_added_cb (GrlRegistry *registry,
+ 		if (source_is_recent (source)) {
+ 			browse (self, self->priv->recent_model,
+ 				NULL, source, NULL, -1);
+-			monitor = TRUE;
++			if (g_str_equal (id, "grl-tracker-source") == FALSE)
++				monitor = TRUE;
+ 		} else if (!source_is_browse_blacklisted (source)) {
+ 			const GdkPixbuf *icon;
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch b/media-video/totem/files/totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch
new file mode 100644
index 0000000..785c6b2
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch
@@ -0,0 +1,26 @@
+From c7fdff8eea6485373fb75f1402c6ce58bb0a1813 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 13 Mar 2015 10:02:29 +0100
+Subject: main: Fix Videos icon not showing in volume control
+
+Forcefully set PulseAudio icon property. Seems that PulseAudio's client
+libraries aren't quite working things out in some cases.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=745874
+
+diff --git a/src/totem.c b/src/totem.c
+index 2600921..3152ae0 100644
+--- a/src/totem.c
++++ b/src/totem.c
+@@ -72,7 +72,7 @@ main (int argc, char **argv)
+ 	g_set_application_name (_("Videos"));
+ 	gtk_window_set_default_icon_name ("totem");
+ 	g_setenv("PULSE_PROP_media.role", "video", TRUE);
+-
++	g_setenv("PULSE_PROP_application.icon_name", "totem", TRUE);
+ 
+ 	/* Build the main Totem object */
+ 	totem = g_object_new (TOTEM_TYPE_OBJECT,
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0006-add-debug-statements.patch b/media-video/totem/files/totem-3.14.2-0006-add-debug-statements.patch
new file mode 100644
index 0000000..ce08a2d
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0006-add-debug-statements.patch
@@ -0,0 +1,31 @@
+From dd2b351e5bdc31da2b047b5a009825209cf0d492 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 23 Apr 2015 17:19:31 +0200
+Subject: grilo: Add debug statements
+
+https://bugzilla.gnome.org/show_bug.cgi?id=746165
+
+diff --git a/src/totem-grilo.c b/src/totem-grilo.c
+index 733d9c9..a0c9027 100644
+--- a/src/totem-grilo.c
++++ b/src/totem-grilo.c
+@@ -2487,6 +2487,8 @@ totem_grilo_finalize (GObject *object)
+ void
+ totem_grilo_start (TotemGrilo *self)
+ {
++	g_debug ("TotemGrilo: Resuming videos thumbnailing");
++
+ 	totem_grilo_resume_icon_thumbnailing ();
+ 
+ 	if (self->priv->plugins_loaded)
+@@ -2501,6 +2503,7 @@ totem_grilo_start (TotemGrilo *self)
+ void
+ totem_grilo_pause (TotemGrilo *self)
+ {
++	g_debug ("TotemGrilo: Pausing videos thumbnailing");
+ 	totem_grilo_pause_icon_thumbnailing ();
+ }
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch b/media-video/totem/files/totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch
new file mode 100644
index 0000000..f476007
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch
@@ -0,0 +1,91 @@
+From 295b6d0896177b0f3f778fb0fc1b0efd5595fde3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 23 Apr 2015 17:21:44 +0200
+Subject: main: Fix thumbnailing starting when launching with a video
+
+We were previously relying on optionstate.filenames being non-NULL to
+avoid starting thumbnailing when the user opened the player with a
+video, but that actually caused doubly-adding those files passed on the
+command-line, and didn't work when the Open() GApplication method was
+used.
+
+Use a separate option to keep track of whether to start populating the
+grilo icon view and thumbnailing, so that thumbnailing doesn't hamper
+playback performance.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=746165
+
+diff --git a/src/totem-object.c b/src/totem-object.c
+index 5ec8255..b9eb2f2 100644
+--- a/src/totem-object.c
++++ b/src/totem-object.c
+@@ -145,6 +145,8 @@ totem_object_app_open (GApplication  *application,
+ 	GSList *slist = NULL;
+ 	int i;
+ 
++	optionstate.had_filenames = (n_files > 0);
++
+ 	g_application_activate (application);
+ 
+ 	totem_object_set_main_page (TOTEM_OBJECT (application), "player");
+@@ -237,21 +239,23 @@ totem_object_app_activate (GApplication *app)
+ 	 * it comes from a plugin */
+ 	totem_object_plugins_init (totem);
+ 
+-	if (optionstate.filenames == NULL) {
+-		totem_object_set_main_page (totem, "grilo");
+-		if (totem_session_try_restore (totem) == FALSE)
++	/* We're only supposed to be called from totem_object_app_handle_local_options()
++	 * and totem_object_app_open() */
++	g_assert (optionstate.filenames == NULL);
++
++	if (!optionstate.had_filenames) {
++		if (totem_session_try_restore (totem) == FALSE) {
++			totem_object_set_main_page (totem, "grilo");
+ 			totem_object_set_mrl (totem, NULL, NULL);
++		} else {
++			totem_object_set_main_page (totem, "player");
++		}
+ 	} else {
+ 		totem_object_set_main_page (totem, "player");
+-		if (totem_object_open_files (totem, optionstate.filenames))
+-			totem_object_play_pause (totem);
+-		else
+-			totem_object_set_mrl (totem, NULL, NULL);
+-
+-		g_strfreev (optionstate.filenames);
+-		optionstate.filenames = NULL;
+ 	}
+ 
++	optionstate.had_filenames = FALSE;
++
+ 	/* Set the logo at the last minute so we won't try to show it before a video */
+ 	bacon_video_widget_set_logo (totem->bvw, "totem");
+ 
+diff --git a/src/totem-options.c b/src/totem-options.c
+index daba578..06b4f7c 100644
+--- a/src/totem-options.c
++++ b/src/totem-options.c
+@@ -106,6 +106,7 @@ totem_options_process_for_server (Totem               *totem,
+ 
+ 	filenames = options->filenames;
+ 	options->filenames = NULL;
++	options->had_filenames = (filenames != NULL);
+ 
+ 	/* Send the files to enqueue */
+ 	for (i = 0; filenames && filenames[i] != NULL; i++) {
+diff --git a/src/totem-options.h b/src/totem-options.h
+index 662b775..f388706 100644
+--- a/src/totem-options.h
++++ b/src/totem-options.h
+@@ -48,6 +48,7 @@ typedef struct {
+ 	gboolean replace;
+ 	gint64 seek;
+ 	gchar **filenames;
++	gboolean had_filenames;
+ } TotemCmdLineOptions;
+ 
+ extern const GOptionEntry all_options[];
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch b/media-video/totem/files/totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch
new file mode 100644
index 0000000..e18c488
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch
@@ -0,0 +1,23 @@
+From fa130c465423038db5636aa5cb977e90f0794ac8 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 24 Apr 2015 15:58:23 +0200
+Subject: grilo: Make thumbnail reading cancellable
+
+https://bugzilla.gnome.org/show_bug.cgi?id=748370
+
+diff --git a/src/icon-helpers.c b/src/icon-helpers.c
+index 08d556a..feb15b3 100644
+--- a/src/icon-helpers.c
++++ b/src/icon-helpers.c
+@@ -296,7 +296,7 @@ totem_grilo_get_thumbnail (GObject             *object,
+ 
+ 	file = g_file_new_for_uri (url_thumb);
+ 	g_task_set_task_data (task, file, g_object_unref);
+-	g_file_read_async (file, G_PRIORITY_DEFAULT, NULL,
++	g_file_read_async (file, G_PRIORITY_DEFAULT, cancellable,
+ 			   get_stream_thumbnail_cb, task);
+ }
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch b/media-video/totem/files/totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch
new file mode 100644
index 0000000..3ef3e13
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch
@@ -0,0 +1,37 @@
+From ee959d9d4611c820218b6f015734a7e4f86aedfd Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 24 Apr 2015 17:17:36 +0200
+Subject: grilo: Limit ourselves to running one thumbnailer at a time
+
+Our thumbnailer currently doesn't have support for using hardware
+decoding, so it's pretty CPU intensive. On my machine (i7 laptop with an
+SSD), one thumbnailer would take about 40% of CPU. This causes both lag
+when navigating the videos list, and carries on hampering video playback
+if thumbnailing is started before playback.
+
+This is good enough to mark this bug as fixed:
+https://bugzilla.gnome.org/show_bug.cgi?id=748370
+
+though a better solution would be to cancel thumbnailing in
+totem_grilo_pause(), make sure that
+gnome_desktop_thumbnail_path_for_uri() is cancellable, and try to
+distinguish in totem-grilo.c between cancellation because the player is
+getting shut down, and cancellation because we want all the resources to
+go to the player.
+
+diff --git a/src/icon-helpers.c b/src/icon-helpers.c
+index feb15b3..f073f26 100644
+--- a/src/icon-helpers.c
++++ b/src/icon-helpers.c
+@@ -30,7 +30,7 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API 1
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ 
+-#define DEFAULT_MAX_THREADS   5
++#define DEFAULT_MAX_THREADS   1
+ #define THUMB_SEARCH_SIZE     256
+ #define THUMB_SEARCH_HEIGHT   (THUMB_SEARCH_SIZE / 4 * 3)
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/files/totem-3.14.2-0010-fix-detection-of-valac.patch b/media-video/totem/files/totem-3.14.2-0010-fix-detection-of-valac.patch
new file mode 100644
index 0000000..075c98b
--- /dev/null
+++ b/media-video/totem/files/totem-3.14.2-0010-fix-detection-of-valac.patch
@@ -0,0 +1,31 @@
+From 404cfda65a5b444bad4fe0fd6dbf73da8ec36d88 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 27 Apr 2015 13:32:58 +0200
+Subject: build: Fix detection of valac
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+AM_PROG_VALAC very helpfully sets $VALAC to:
+"Absolute path to the Vala compiler, or simply ‘valac’ if no suitable
+compiler Vala could be found at configure runtime."
+
+We were checking for $VALAC being empty, thus still trying to build Vala
+plugins even if Vala wasn't available.
+
+diff --git a/configure.ac b/configure.ac
+index 20ec003..47718b0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -263,7 +263,7 @@ AC_ARG_ENABLE([vala],
+ AC_MSG_RESULT([$enable_vala])
+ if test "x$enable_vala" != "xno"; then
+ 	AM_PROG_VALAC([$VALA_REQS])
+-	if test "x$VALAC" = "x"; then
++	if test "$VALAC" = "valac"; then
+ 		if test "x$enable_vala" = "xyes"; then
+ 			AC_MSG_ERROR([Vala plugin support explicitly requested, but not found])
+ 		fi
+-- 
+cgit v0.10.2
+
diff --git a/media-video/totem/totem-3.14.2-r1.ebuild b/media-video/totem/totem-3.14.2-r1.ebuild
new file mode 100644
index 0000000..0630569
--- /dev/null
+++ b/media-video/totem/totem-3.14.2-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.14.2.ebuild,v 1.5 2015/03/15 13:29:45 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+introspection lirc nautilus +python test zeitgeist"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	zeitgeist? ( introspection )
+"
+
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup to test it
+#
+# FIXME:
+# Automagic tracker-0.9.0
+# Runtime dependency on gnome-session-2.91
+RDEPEND="
+	>=dev-libs/glib-2.35:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=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-libs/cairo
+	>=dev-libs/libxml2-2.6:2
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-1.5.5:2.0
+	>=media-libs/clutter-gtk-1.5.5:1.0
+	x11-libs/mx:1.0
+
+	>=media-libs/grilo-0.2.11:0.2[playlist]
+	media-plugins/grilo-plugins:0.2
+	>=media-libs/gstreamer-1.3.1:1.0
+	>=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	media-plugins/gst-plugins-meta:1.0
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXxf86vm-1.0.1
+
+	gnome-base/gnome-desktop:3
+	gnome-base/gsettings-desktop-schemas
+	x11-themes/gnome-icon-theme-symbolic
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.5.2:3[introspection] )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/scrollkeeper
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	x11-proto/xextproto
+	x11-proto/xproto
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	dev-libs/gobject-introspection-common
+#	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
+}
+
+src_prepare() {
+	# Prevent pylint usage by tests, bug #482538
+	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
+
+    epatch "${FILESDIR}/${P}-0001-bump-required-grilo-version.patch"
+    epatch "${FILESDIR}/${P}-0002-fix-doubling-files-added-on-the-cmd-line.patch"
+    epatch "${FILESDIR}/${P}-0003-simplify-test-whether-to-monitor-a-source.patch"
+    epatch "${FILESDIR}/${P}-0004-don-t-monitor-tracker.patch"
+    epatch "${FILESDIR}/${P}-0005-fix-videos-icon-not-showing-in-volume-control.patch"
+    epatch "${FILESDIR}/${P}-0006-add-debug-statements.patch"
+    epatch "${FILESDIR}/${P}-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch"
+    epatch "${FILESDIR}/${P}-0008-make-thumbnail-reading-cancellable.patch"
+    epatch "${FILESDIR}/${P}-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch"
+    epatch "${FILESDIR}/${P}-0010-fix-detection-of-valac.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
+
+src_configure() {
+	# Disabled: sample-python, sample-vala
+	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+=",skipto,vimeo"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use zeitgeist && plugins+=",zeitgeist-dp"
+
+	# pylint is checked unconditionally, but is only used for make check
+	gnome2_src_configure \
+		--disable-run-in-source-tree \
+		--disable-static \
+		--enable-easy-codec-installation \
+		--enable-vala \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable python) \
+		PYLINT=$(type -P true) \
+		VALAC=$(type -P true) \
+		--with-plugins=${plugins}
+}