Revision bump including patches from master and 2.32 upstream branches fixing some bugs, this also unset DBUS_SESSION_BUS_ADDRESS to prevent bug #332139 problems and xml validation fix (bug #357893 by Dustin Polke). Remove old.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

5 files changed, 55 insertions, 147 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 73b7ad7e1163..4c543ba445a4 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.317 2011/03/22 19:38:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.318 2011/04/02 12:03:50 pacho Exp $
+
+*totem-2.32.0-r1 (02 Apr 2011)
+
+  02 Apr 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/totem-2.26.1-smclient-target-detection.patch, -totem-2.30.2.ebuild,
+  -files/totem-2.30.2-init-gtype.patch, -files/totem-2.30.2-webm-support.patch,
+  +totem-2.32.0-r1.ebuild:
+  Revision bump including patches from master and 2.32 upstream branches fixing
+  some bugs, this also unset DBUS_SESSION_BUS_ADDRESS to prevent bug #332139
+  problems and xml validation fix (bug #357893 by Dustin Polke). Remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> totem-2.32.0.ebuild:
   Marking totem-2.32.0 ppc stable for bug 353436
diff --git a/media-video/totem/files/totem-2.26.1-smclient-target-detection.patch b/media-video/totem/files/totem-2.26.1-smclient-target-detection.patch
deleted file mode 100644
index 6be089a170f3..000000000000
--- a/media-video/totem/files/totem-2.26.1-smclient-target-detection.patch
+++ /dev/null
@@ -1,46 +0,0 @@
----
- Fixing passing any kind of argument to --with-smclient
-
- configure.in |   23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -226,18 +226,29 @@ GDK_TARGET="$($PKG_CONFIG --variable tar
- SMCLIENT_PKGS=
- AC_MSG_CHECKING([which smclient backend to use])
- AC_ARG_WITH([smclient],
--  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
-+  [AS_HELP_STRING([--with-smclient],[which smclient backend to use @<:@xsmp/win32/quartz/auto@:>@])],
-   [],
--  [case "$GDK_TARGET" in
--    x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
-+  [$with_smclient=auto])
-+
-+
-+if test "$with_smclient" != "no"; then
-+
-+  if test "$with_smclient" != "auto" -a "$with_smclient" != "yes"; then
-+    GDK_TARGET="$with_smclient"
-+  fi
-+
-+  case "$GDK_TARGET" in
-+    x11|xsmp) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
-     win32|quartz) with_smclient=$GDK_TARGET ;;
-     *) with_smclient=no ;;
--   esac])
--AC_MSG_RESULT([$with_smclient])
-+  esac
-+
-+  AC_MSG_RESULT([$with_smclient])
- 
--if test "$with_smclient" != "no"; then
-   PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
-   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
-+else
-+  AC_MSG_RESULT([$with_smclient])
- fi
- 
- AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
diff --git a/media-video/totem/files/totem-2.30.2-init-gtype.patch b/media-video/totem/files/totem-2.30.2-init-gtype.patch
deleted file mode 100644
index 18e73dc2465c..000000000000
--- a/media-video/totem/files/totem-2.30.2-init-gtype.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From dc894da891c37c30b0acb648da9d49e2bc9c6d61 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 16 Jun 2010 13:49:14 +0000
-Subject: Initialise the GType system when called into
-
-Add calls to g_type_init() in the plugin entry points so that
-GThread is initialised if not already, so that GIO calls work
-as expected.
-
-Note that this requires GLib 2.24 to work properly, so only
-done in master (gnome-2-30 depends on GLib 2.22)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=621771
----
-diff --git a/browser-plugin/totemPluginGlue.cpp b/browser-plugin/totemPluginGlue.cpp
-index fc5afc1..f14b913 100644
---- a/browser-plugin/totemPluginGlue.cpp
-+++ b/browser-plugin/totemPluginGlue.cpp
-@@ -315,6 +315,8 @@ NP_GetMIMEDescription (void)
- 	if (mime_list != NULL)
- 		return mime_list;
- 
-+	g_type_init ();
-+
- 	list = g_string_new (NULL);
- 
- 	/* Load the configuration files for the enabled plugins */
-@@ -396,6 +398,8 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable,
- {
- 	g_debug ("NP_Initialize");
- 
-+	g_type_init ();
-+
- 	if (aMozillaVTable == NULL || aPluginVTable == NULL)
- 		return NPERR_INVALID_FUNCTABLE_ERROR;
- 
---
-cgit v0.8.3.1
diff --git a/media-video/totem/files/totem-2.30.2-webm-support.patch b/media-video/totem/files/totem-2.30.2-webm-support.patch
deleted file mode 100644
index e82a02116680..000000000000
--- a/media-video/totem/files/totem-2.30.2-webm-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2285e792f616f3be400f7eaab51d3a528afe8e68 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Thu, 20 May 2010 15:57:42 +0000
-Subject: Add WebM support to Totem and browser plugin
-
----
-diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
-index 5382bb2..1c420f3 100644
---- a/browser-plugin/totemPlugin.cpp
-+++ b/browser-plugin/totemPlugin.cpp
-@@ -126,6 +126,7 @@ static const totemPluginMimeEntry kMimeTypes[] = {
-   { "audio/mpeg", "mp3", NULL },
-   { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
-   { "video/flv", "flv", "application/x-flash-video" },
-+  { "video/webm", "webm", NULL },
-   { "application/x-totem-plugin", "", "Totem Multimedia plugin" },
-   { "audio/midi", "mid, midi", NULL },
- #else
-diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
-index 303bb23..a6eab04 100644
---- a/data/mime-type-list.txt
-+++ b/data/mime-type-list.txt
-@@ -82,6 +82,7 @@ video/vivo
- video/vnd.divx
- video/vnd.rn-realvideo
- video/vnd.vivo
-+video/webm
- video/x-anim
- video/x-avi
- video/x-flc
---
-cgit v0.8.3.1
diff --git a/media-video/totem/totem-2.30.2.ebuild b/media-video/totem/totem-2.32.0-r1.ebuild
index 3f04dafeff2f..4f8f75450541 100644
--- a/media-video/totem/totem-2.30.2.ebuild
+++ b/media-video/totem/totem-2.32.0-r1.ebuild
@@ -1,39 +1,43 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.2.ebuild,v 1.10 2011/03/21 22:14:04 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r1.ebuild,v 1.1 2011/04/02 12:03:50 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="threads"
 
 inherit autotools eutils gnome2 multilib python
 
 DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
+HOMEPAGE="http://projects.gnome.org/totem/"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 # FIXME: Enable for now python USE flag per bug #316409
 # this change should only be noticed by people not following current
 # current linux profiles default
-IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker +youtube" #zeroconf
+IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker upnp +youtube" #zeroconf
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
 # check gmyth requirement ? -> waiting for updates in tree
-# coherence plugin not enabled until we have deps in tree
 # vala ( dev-lang/vala ) requires 0.7.5
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=x11-libs/gtk+-2.19.5:2
+RDEPEND=">=dev-libs/glib-2.25.11:2
+	>=x11-libs/gtk+-2.21.8:2
 	>=gnome-base/gconf-2:2
-	>=dev-libs/totem-pl-parser-2.29.1
+	>=dev-libs/totem-pl-parser-2.30.2
 	>=x11-themes/gnome-icon-theme-2.16
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6:2
 	>=dev-libs/dbus-glib-0.82
-	>=media-libs/gstreamer-0.10.28.1:0.10
+	>=media-libs/gstreamer-0.10.30:0.10
 	>=media-libs/gst-plugins-good-0.10:0.10
-	>=media-libs/gst-plugins-base-0.10.26:0.10
+	>=media-libs/gst-plugins-base-0.10.30:0.10
 	>=media-plugins/gst-plugins-gconf-0.10:0.10
 
 	>=media-plugins/gst-plugins-taglib-0.10:0.10
@@ -43,6 +47,7 @@ RDEPEND=">=dev-libs/glib-2.24:2
 	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
 
 	dev-libs/libunique:1
+	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXtst
@@ -61,16 +66,18 @@ RDEPEND=">=dev-libs/glib-2.24:2
 	nautilus? ( >=gnome-base/nautilus-2.10 )
 	nsplugin? ( media-plugins/gst-plugins-soup:0.10 )
 	python? (
-		dev-lang/python[threads]
 		>=dev-python/pygtk-2.12:2
 		dev-python/pyxdg
 		dev-python/gst-python:0.10
 		dev-python/dbus-python
 		dev-python/gconf-python:2 )
 	tracker? ( >=app-misc/tracker-0.8.1 )
+	upnp? ( media-video/coherence )
 	youtube? (
 		>=dev-libs/libgdata-0.4
-		media-plugins/gst-plugins-soup:0.10 )"
+		net-libs/libsoup:2.4
+		media-plugins/gst-plugins-soup:0.10
+		>=dev-libs/totem-pl-parser-2.32.4[quvi] )"
 # FIXME: freezes totem
 #	zeroconf? ( >=net-libs/libepc-0.3 )
 DEPEND="${RDEPEND}
@@ -78,18 +85,21 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xf86vidmodeproto
 	app-text/scrollkeeper
-	gnome-base/gnome-common
-	app-text/gnome-doc-utils
+	>=app-text/gnome-doc-utils-0.20.3
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.20
+	app-text/docbook-xml-dtd:4.5
+	gnome-base/gnome-common
 	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.11 )
-	app-text/docbook-xml-dtd:4.5"
-# docbook-xml-dtd is needed for user doc
+	doc? ( >=dev-util/gtk-doc-1.11 )"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+# docbook-xml-dtd is needed for user doc
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-schemas-install
@@ -105,13 +115,14 @@ pkg_setup() {
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
 		PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
 
-	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot"
+	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot,chapters"
 	use bluetooth && plugins="${plugins},bemused"
 	use galago && plugins="${plugins},galago"
 	use iplayer && plugins="${plugins},iplayer"
 	use lirc && plugins="${plugins},lirc"
 	use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service"
 	use tracker && plugins="${plugins},tracker"
+	use upnp && plugins="${plugins},coherence_upnp"
 	use youtube && plugins="${plugins},youtube"
 	#use zeroconf && plugins="${plugins},publish"
 
@@ -121,22 +132,21 @@ pkg_setup() {
 		$(use_enable debug)
 		$(use_enable nautilus)
 		$(use_enable python)"
+
+	python_set_active_version 2
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix broken smclient option passing
-	epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch"
-
-	# Add WebM support to Totem and browser plugin
-	epatch "${FILESDIR}/${P}-webm-support.patch"
+	# Use fixed gnome-doc-utils.make, bug #348403 (can be dropped in next bump)
+	cp -f /usr/share/gnome-doc-utils/gnome-doc-utils.make . || die
 
-	# Add support for video/mp2t
-	epatch "${FILESDIR}/${P}-mp2t-support.patch"
+	# Fix broken smclient option passing
+	epatch "${FILESDIR}/${PN}-2.32.0-smclient-target-detection.patch"
 
-	# Initialise the GType system when called into (bug #324237)
-	epatch "${FILESDIR}/${P}-init-gtype.patch"
+	# Apply multiple backports and fixes from master and 2.32 branch
+	epatch "${WORKDIR}/${P}-patches"/*.patch
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
@@ -154,6 +164,7 @@ src_configure() {
 	addpredict "$(unset HOME; echo ~)/.gconfd"
 	addpredict "$(unset HOME; echo ~)/.gnome2"
 
+	unset DBUS_SESSION_BUS_ADDRESS
 	gnome2_src_configure
 }
 
@@ -161,7 +172,10 @@ src_install() {
 	gnome2_src_install
 	# Installed for plugins, but they're dlopen()-ed
 	# firefox, totem as well as nautilus
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+
+	# Fix python script shebangs
+	python_convert_shebangs 2 "${ED}"/usr/libexec/totem/totem-bugreport.py
 }
 
 pkg_postinst() {