Bump to 3.2.1 from the gnome overlay. Drop old. Move to EAPI4. Drop alpha, arm, ia64. ppc, ppc64, sparc keywords due to libpeas, mx, clutter-{gst,gtk} dependencies. Keywording bug will be filed later for all of gnome-3.2. Notable changes: video is now rendered using clutter; the grilo plugin (auto-activated if built) replaces several plugins in older versions; pygobject-3 compatibility.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

4 files changed, 50 insertions, 80 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index c86c032f8f9b..eba1c9e52976 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,17 @@
 # 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.325 2011/10/05 17:54:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.326 2011/11/03 06:18:47 tetromino Exp $
+
+*totem-3.2.1 (03 Nov 2011)
+
+  03 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/totem-2.90.0-smclient-target-detection.patch, -totem-3.0.1.ebuild,
+  +totem-3.2.1.ebuild, metadata.xml:
+  Bump to 3.2.1 from the gnome overlay. Drop old. Move to EAPI4. Drop alpha,
+  arm, ia64. ppc, ppc64, sparc keywords due to libpeas, mx, clutter-{gst,gtk}
+  dependencies. Notable changes: video is now rendered using clutter; the grilo
+  plugin (auto-activated if built) replaces several plugins in older versions;
+  pygobject-3 compatibility.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> totem-2.32.0-r2.ebuild:
   ppc/ppc64 stable wrt #369909
diff --git a/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch b/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
deleted file mode 100644
index ad6cc690e4fe..000000000000
--- a/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -pur totem-2.90.0.orig/configure.in totem-2.90.0/configure.in
---- totem-2.90.0.orig/configure.in	2010-06-19 14:22:16.000000000 -0400
-+++ totem-2.90.0/configure.in	2010-06-25 20:52:05.720211025 -0400
-@@ -153,18 +153,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 ice" ;;
-+  [$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 ice" ;;
-     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/metadata.xml b/media-video/totem/metadata.xml
index f1bcb5ec3075..796969998082 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -12,6 +12,8 @@ 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="galago">Allow Totem to set your IM client to "away" when a movie
 		is playing in fullscreen using <pkg>dev-libs/libgalago</pkg></flag>
+	<flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
+		from various sources</flag>
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 		for introspection</flag>
 	<flag name="iplayer">Enable BBC player support</flag>
diff --git a/media-video/totem/totem-3.0.1.ebuild b/media-video/totem/totem-3.2.1.ebuild
index a070ce6bed39..bdeb866e2679 100644
--- a/media-video/totem/totem-3.0.1.ebuild
+++ b/media-video/totem/totem-3.2.1.ebuild
@@ -1,8 +1,8 @@
 # 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-3.0.1.ebuild,v 1.1 2011/08/16 22:34:06 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.1.ebuild,v 1.1 2011/11/03 06:18:47 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
 WANT_AUTOMAKE="1.11"
@@ -10,15 +10,15 @@ PYTHON_DEPEND="python? 2:2.4"
 PYTHON_USE_WITH="threads"
 PYTHON_USE_WITH_OPT="python"
 
-inherit autotools eutils gnome2 multilib python
+inherit gnome2 multilib python
 
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="http://projects.gnome.org/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bluetooth doc +introspection iplayer lirc nautilus nsplugin +python tracker +youtube vala zeroconf"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala" # zeroconf
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
@@ -31,13 +31,16 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
 	>=x11-libs/gtk+-2.99.3:3[introspection?]
 	>=dev-libs/totem-pl-parser-2.32.4[introspection?]
-	>=dev-libs/libpeas-0.7.2[gtk]
+	>=dev-libs/libpeas-1.1.0[gtk]
 	>=x11-themes/gnome-icon-theme-2.16
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/dbus-glib-0.82
+	>=media-libs/clutter-1.6.8:1.0
+	>=media-libs/clutter-gst-1.3.9:1.0
+	>=media-libs/clutter-gtk-1.0.2:1.0
 	>=media-libs/gstreamer-0.10.30:0.10
 	>=media-libs/gst-plugins-base-0.10.30:0.10
+	x11-libs/mx:1.0
 
 	media-libs/gst-plugins-good:0.10
 	media-plugins/gst-plugins-taglib:0.10
@@ -50,17 +53,19 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXtst
-	>=x11-libs/libXrandr-1.1.1
 	>=x11-libs/libXxf86vm-1.0.1
 
 	bluetooth? ( net-wireless/bluez )
+	grilo? ( >=media-libs/grilo-0.1.16 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	lirc? ( app-misc/lirc )
 	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
+	nsplugin? (
+		>=dev-libs/dbus-glib-0.82
+		>=x11-misc/shared-mime-info-0.22 )
 	python? (
 		>=dev-libs/gobject-introspection-0.6.7
-		>=dev-python/pygobject-2.27.0[introspection]
+		>=dev-python/pygobject-2.90.3:3
 		>=x11-libs/gtk+-2.91.7:3[introspection]
 		dev-python/pyxdg
 		dev-python/gst-python:0.10
@@ -69,20 +74,19 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
 			dev-python/httplib2
 			dev-python/feedparser
 			dev-python/beautifulsoup ) )
-	tracker? ( >=app-misc/tracker-0.9.34 )
-	vala? ( >=dev-lang/vala-0.11.1:0.12 )
+	vala? ( >=dev-lang/vala-0.12.1:0.12 )
 	youtube? (
 		>=dev-libs/libgdata-0.7.0
 		net-libs/libsoup:2.4
 		media-plugins/gst-plugins-soup:0.10
-		>=dev-libs/totem-pl-parser-2.32.4[quvi] )
-	zeroconf? ( >=net-libs/libepc-0.3 )"
+		>=dev-libs/totem-pl-parser-2.32.4[quvi] )"
+#	zeroconf? ( >=net-libs/libepc-0.5.0 )
+# XXX: zeroconf requires unreleased version of libepc
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	x11-proto/xproto
 	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.20.3
 	>=dev-util/intltool-0.40
@@ -93,23 +97,17 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1.14 )"
 # docbook-xml-dtd is needed for user doc
 
-pkg_setup() {
-	# To remove when python eclass supports EAPI=4
-	# see bug #359379
-	if use python && ! use introspection; then
-		eerror "USE=python requires USE=introspection"
-		die "USE=python requires USE=introspection"
-	fi
+# see bug #359379
+REQUIRED_USE="python? ( introspection )"
 
+pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		--disable-run-in-source-tree
 		--disable-schemas-compile
 		--disable-scrollkeeper
 		--disable-static
-		--with-dbus
-		--with-smclient
+		--with-smclient=auto
 		--enable-easy-codec-installation
 		$(use_enable introspection)
 		$(use_enable nautilus)
@@ -119,39 +117,37 @@ pkg_setup() {
 		$(use_enable vala)
 		VALAC=$(type -P valac-0.12)
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+	#--with-smclient=auto needed to correctly link to libICE and libSM
 
-	# Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
+	# Disabled: sample-python, sample-vala, zeitgeist-dp
 	local plugins="brasero-disc-recorder,chapters,im-status,gromit"
 	plugins="${plugins},media-player-keys,ontop,properties,screensaver"
-	plugins="${plugins},screenshot,sidebar-test,skipto,thumbnail"
+	plugins="${plugins},screenshot,sidebar-test,skipto"
 	use bluetooth && plugins="${plugins},bemused"
+	use grilo && plugins="${plugins},grilo"
 	use iplayer && plugins="${plugins},iplayer"
 	use lirc && plugins="${plugins},lirc"
 	use nautilus && plugins="${plugins},save-file"
-	use python && plugins="${plugins},dbus-service,jamendo,pythonconsole,opensubtitles"
-	use tracker && plugins="${plugins},tracker"
+	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
+	use vala && plugins="${plugins},rotation"
 	use youtube && plugins="${plugins},youtube"
-	use zeroconf && plugins="${plugins},publish"
+	# XXX: zeroconf requires unreleased version of libepc
+	# use zeroconf && plugins="${plugins},publish"
 
 	G2CONF="${G2CONF} --with-plugins=${plugins}"
 
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
 	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
 	mkdir -p m4
 
-	# Don't check for gconf sinks, causes access violations that we can't fix.
-	# See bug 358755
-	sed -ri -e 's/gconf[a-z]+sink //g' configure* || die "gconf sed failed"
-
-	# Fix broken smclient option passing
-	# FIXME: File a bug for this
-	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	#if [[ ${PV} != 9999 ]]; then
+	#	intltoolize --force --copy --automake || die "intltoolize failed"
+	#	eautoreconf
+	#fi
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig