Apply upstream patch to be compatible with vimeo videos, pass configure options properly (#475878 by Mark R. Pariente), USE grilo needs grilo-plugins (#475886 by Mark R. Pariente, confirmed by me and seen in Fedora .spec), drop old and broken versions.

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

5 files changed, 179 insertions, 155 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 3ca70727f5a7..2a9860823d5d 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.362 2013/06/30 21:36:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.363 2013/07/14 19:09:54 pacho Exp $
+
+*totem-3.8.2-r1 (14 Jul 2013)
+
+  14 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/totem-3.8.2-vimeo-compat.patch, +totem-3.8.2-r1.ebuild,
+  -totem-3.8.0.ebuild, -totem-3.8.2.ebuild:
+  Apply upstream patch to be compatible with vimeo videos, pass configure
+  options properly (#475878 by Mark R. Pariente), USE grilo needs grilo-plugins
+  (#475886 by Mark R. Pariente, confirmed by me and seen in Fedora .spec), drop
+  old and broken versions.
 
   30 Jun 2013; Gilles Dartiguelongue <eva@gentoo.org> totem-3.8.2.ebuild:
   Apply team policy for configure and update gtk+ dependency per libgd
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 056b8d8b580d..baeee1f86cf0 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -3,21 +3,20 @@ 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.6.3.tar.xz 3120056 SHA256 ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60 SHA512 adb8c568aafd09fb87ef93b48a9c9bc490471690c0c52d66cde5ba00e527d342be99d54b40e4f0293604bee5ef2f3200a200047a7c92ac1920723e6fb18e5b6d WHIRLPOOL 53e1ce226f124295c8eca321c9a513d01bb07454232aa2d2dd6623d6501e9270193e5a8668e81f0fd51e3746720a79bc88903b79741a7dda4c452e8e281f9568
-DIST totem-3.8.0.tar.xz 3144516 SHA256 74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039 SHA512 61e34b4a5bbec29b0e653d47c79c595da62bd16228ce1771283c2a8292b992f5122dcd179c115b2e7705104c63acb567df9858cba5cb14166a1356efc35bfc26 WHIRLPOOL 669d39747861f0cff53891e6de3157b30d389d2721ef3f5a87c768b382e6fee2c1e022cc323e8b73ad5d298a5fe313bb47229396276b60e48229884ce4ced139
 DIST totem-3.8.2.tar.xz 3153052 SHA256 eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01 SHA512 deb30fc7c6c37df7e647bdf206a1d08199933cbb54dec0e8e3173562e3243f5e7ff42936768841f84216d8a51602264ba78377c507bc6d90b2ab9d38f825856c WHIRLPOOL 29286d1b0b4ccb88c453834a527cc3112e7f31f32a6a23a100acd6d8ac60b352c55ca59e8077bfe7e68b7902453d811ae26aaa3661096041a605ee2a8a31af26
 EBUILD totem-2.32.0-r2.ebuild 6083 SHA256 602096eca2fbb7fa7d09215044ac96361f5b378b8646e8daba33ea0190bab160 SHA512 93fb7e90e73d796fc50a4de32248b417485b4d3f7fbad6cb337b5e9cbff01552c31df59ed6fe8af1b57bccd226217de32d55447c3db950606ba5d4891b86823f WHIRLPOOL 6cbf5edefe1a4dec0709d3ef169269a881dfef31a9774594467816730fa796bd5472c3b11b98c004e51347810d6e65ca2904799dde94bb311327cf778f7cb0af
 EBUILD totem-3.6.3-r1.ebuild 4475 SHA256 e3d2c43fd6722bab81aeb098cf896c7372694463b227630224f1214fbfda3dcd SHA512 3ea621cf395bcf52db6cb519be26c2786459c9c46b2afbd8aca69814e401f5e73ac75cadfd66b15047e22dbcd0b4fcbdb49f8ed0e924c254e82a2467b7e20728 WHIRLPOOL 28e2fdfcca69c0082cc7d4ca8cc179590f88b48e7505681c474a0015386f66e3e169f4aca670465b861dc762f09a0a2c06e74f3acab49bf0c44dbfd2b2168c07
-EBUILD totem-3.8.0.ebuild 4237 SHA256 435f6780e7f725e3997f75f5c4b96b1b5d9e478741f546ab95012d7f1b0d00e2 SHA512 ac324a8ec52e84f7365b0aa7517bfe526617246d8700bea03bca66302326b299ecc67fea02c117e8a7ea28aba111989f2c10b45c7bb22cb90558cc86bac96eac WHIRLPOOL b1efd7e667cf08f9c3f917a57172c8f2a7700a586dee8a6cc0aa862e66d4b8d36a04fa1bf2f4e61549ce65e8e833aba91374b13f17903a31abff74bcc91733d0
-EBUILD totem-3.8.2.ebuild 4207 SHA256 d3dc23d3de858c18d981a8c5a517ef1e59025ea10ce66184d1be68ba4fbc9e4e SHA512 8d4c2d95cde3e60e64761ef8819c9a824eb4541c35493ebc2caec252d60b9f8b71df0cb67ce2c5e3634ebcfb4687e28013038f85a8e0fd88e5393a10f14bd80b WHIRLPOOL cf869cd254585aa7d2af14b6ad1bc7094d7d61330089d4e0a337b5d8e7c85f15e8848fa1b4a04b9192462104ebff04a9e87e9c10da5e8b29190968c2d17f50f3
-MISC ChangeLog 54089 SHA256 7b0fc7b1b045576691c099a10077793d3791939f11bac4a5e6a00146397e8e19 SHA512 68e1476872add06487062f952aff0e65449d190e6a09d3a1659ee1d47ce2aabd739892b9f3e1d23c60389c5a087b7868d36085168c0ecd2d1216d4809e1ff267 WHIRLPOOL 93e34c816451aea8dfdcd44a8a7af381739f2f3486dcc1832b5af6c5129f12c729527d9b2a3d8ec7e3f552c5f229084cdc20a5a8cb0ff6cf76065fce2fb0ecfa
+EBUILD totem-3.8.2-r1.ebuild 4398 SHA256 6aeec0505f3ad654c3f52ad0353b201763f8a00361dbaca5a2efd1a79e18eb51 SHA512 5bd1b13c0550b1c2f5ed568ff740762ee71faa38cb73db7eb93201ce3b794a7a4e61732c080a0c99b3cd6a0d87766781f89a88d2117efdc4e4e07e17a4372367 WHIRLPOOL f705278714fe02943ece583b6dadf4e20a8930259361bd336b4c0bcf1361d03a57f2bf12c10524246c57089532945b2f464f68a5203057f67e3609283192e062
+MISC ChangeLog 54539 SHA256 e24d82090190306b00dd6e5ae97b3d95c09db2eb764522507b222907ee6e4671 SHA512 a6c92bfd865473c1d545cf110992d9f7f153e696609b111200ae5ee0313d016c7824b1d62a1f3943e31c15dc2a87fb59664137a75700dfdf5ac7720239d8b629 WHIRLPOOL ee932827861264f952d4c43454e298e133693deea4a7d3ad9c5f5052eb6fe46d982fa34519ae47ad3a20ce96e2ea7713eeb8294a4515a618810d9fd4cb05fbd7
 MISC metadata.xml 1542 SHA256 f20cc9630af8b7ba34b66ae995e734417ab8f4b1142eaf8458a6c385a6f85c1e SHA512 92ae20c93f396d8d1cbee93dbf48ee4bffcb67041ad9af0a4505eb7a0a8b181794da8dafdd575f7113f0d53ec39ccd5612223dc379ed8a25b0545a89b6e4c7fb WHIRLPOOL f64c55c6728a63e82624d895bc4127c7eb34e2d230d4f43007a5cbcc324aabb0184318185c3acf54322a454bb22d65e8392436f7f40c036a2369d8695e0e419d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHQpNkACgkQ1fmVwcYIWAZdGgCgsC9JQwEZeYoDnT8t5BYe7LBT
-MXYAn2lc/3YShvW8rFWF/TwO3HEuqu+z
-=q+qw
+iEYEAREIAAYFAlHi94MACgkQCaWpQKGI+9QoNgCeK4yaNwdc1qtTZBbjubyanE49
+MzkAoIC0Q1lVjbz2JvUqTodDGypKi9ph
+=+B0V
 -----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
new file mode 100644
index 000000000000..789914a612a4
--- /dev/null
+++ b/media-video/totem/files/totem-3.8.2-vimeo-compat.patch
@@ -0,0 +1,151 @@
+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/totem-3.8.0.ebuild b/media-video/totem/totem-3.8.0.ebuild
deleted file mode 100644
index 7a828c47f76a..000000000000
--- a/media-video/totem/totem-3.8.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.8.0.ebuild,v 1.2 2013/06/02 20:44:56 abcd Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	zeitgeist? ( introspection )"
-
-# 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.33:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
-	>=dev-libs/totem-pl-parser-2.32.4[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-gst-1.5.5:2.0
-	>=media-libs/clutter-gtk-1.0.2:1.0
-	x11-libs/mx:1.0
-
-	media-libs/gstreamer: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
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXxf86vm-1.0.1
-
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-symbolic
-
-	flash? ( dev-libs/totem-pl-parser[quvi] )
-	grilo? ( media-libs/grilo: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 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-2.91.7:3[introspection] )
-	zeitgeist? ( dev-libs/libzeitgeist )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/scrollkeeper
-	app-text/yelp-tools
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig
-	test? ( python? ( dev-python/pylint ) )
-"
-# docbook-xml-dtd is needed for user doc
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	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() {
-	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
-
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-	G2CONF="${G2CONF}
-		--disable-run-in-source-tree
-		--disable-static
-		--with-smclient=auto
-		--enable-easy-codec-installation
-		--enable-vala
-		$(use_enable flash vegas-plugin)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable nsplugin browser-plugins)
-		$(use_enable python)
-		VALAC=$(type -P true)
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
-	# XXX: always set to true otherwise tests fails due to pylint not
-	# respecting EPYTHON (wait for python-r1)
-	# pylint is checked unconditionally, but is only used for make check
-	G2CONF="${G2CONF} PYLINT=$(type -P true)"
-
-	# 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+=",sidebar-test,skipto"
-	use grilo && plugins+=",grilo"
-	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use zeitgeist && plugins+=",zeitgeist-dp"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	gnome2_src_configure
-}
diff --git a/media-video/totem/totem-3.8.2.ebuild b/media-video/totem/totem-3.8.2-r1.ebuild
index f0b4606e1a78..713d4c858839 100644
--- a/media-video/totem/totem-3.8.2.ebuild
+++ b/media-video/totem/totem-3.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.8.2.ebuild,v 1.3 2013/06/30 21:36:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.8.2-r1.ebuild,v 1.1 2013/07/14 19:09:54 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_COMPAT=( python2_{6,7} )
 PYTHON_REQ_USE="threads"
 
-inherit gnome2 multilib python-single-r1
+inherit autotools eutils gnome2 multilib python-single-r1
 
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="http://projects.gnome.org/totem/"
@@ -61,7 +61,9 @@ RDEPEND="
 	x11-themes/gnome-icon-theme-symbolic
 
 	flash? ( dev-libs/totem-pl-parser[quvi] )
-	grilo? ( media-libs/grilo:0.2 )
+	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 )
@@ -95,6 +97,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Add hack to allow streaming of Vimeo videos (from 3.8 branch)
+	epatch "${FILESDIR}/${P}-vimeo-compat.patch"
+
+	eautoreconf
 	gnome2_src_prepare
 
 	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
@@ -111,7 +117,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"
+	plugins+=",sidebar-test,skipto,vimeo"
 	use grilo && plugins+=",grilo"
 	use lirc && plugins+=",lirc"
 	use nautilus && plugins+=",save-file"
@@ -123,7 +129,7 @@ src_configure() {
 	# respecting EPYTHON (wait for python-r1)
 	# pylint is checked unconditionally, but is only used for make check
 	gnome2_src_configure \
-		PYLINT=$(type -P true)
+		PYLINT=$(type -P true) \
 		--disable-run-in-source-tree \
 		--disable-static \
 		--with-smclient=auto \