New version for GNOME 2.26. New plugins, UI fixes. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 132 insertions, 371 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index be1fc8fd6ab4..feebdbc6444e 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/totem
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.242 2009/04/28 14:34:34 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.243 2009/05/23 21:41:40 eva Exp $
+
+*totem-2.26.2 (23 May 2009)
+
+  23 May 2009; Gilles Dartiguelongue <eva@gentoo.org> -totem-2.18.3.ebuild,
+  totem-2.20.3.ebuild, -totem-2.22.2-r1.ebuild, -totem-2.24.4.ebuild,
+  +files/totem-2.26.1-smclient-target-detection.patch, +totem-2.26.2.ebuild:
+  New version for GNOME 2.26. New plugins, UI fixes. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> totem-2.20.3.ebuild:
   arm/sh stable
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 091447964e6c..2c67585d3a67 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,17 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX totem-2.18.1-browser-plugins.patch 2354 RMD160 bf6848064f870120462ad2c877142496b0bee53a SHA1 03cb04a700ffcfc205429ab9ad2594a92dc3787d SHA256 ae6d8ba52b4b30e746d628b057d2274e03a7d9ff5e91bfb5f4c76f3eeb18363f
 AUX totem-2.20.1-startup-notification.patch 1235 RMD160 2b2f1dc18a7910019adf1a831aa2ca3a1febb080 SHA1 1a26bd044901ef3969a042b621c59bd7c2bb86a9 SHA256 88ec75d7ad5d3e637592b91301e28d8241c652e576f1fade9c34e0d2016865e2
 AUX totem-2.20.1-xpcom-hack.patch 414 RMD160 11f8440cd1798c161ef7070dda90fa8c7abf5ccd SHA1 ccfb2c9e4f422454f3ee0ec97850d8e9a272ed4f SHA256 0db11c34b49c80c13e8385fc207a5fcd66f25d17aea1edca65f67a96ee663e71
 AUX totem-2.22.2-fix-python-and-libtool-2.2.patch 1539 RMD160 344c21712640e8e7694c673299fb857d5915eb5a SHA1 186afa164e57c39d75b38ee81be1be50c9711420 SHA256 4451eb5264a9b6fd5c977bfcad558f391fe1e92e0a216d845f81cc6939cf6cd1
-DIST totem-2.18.3.tar.bz2 2079989 RMD160 6ff89df93be257de2de62f7258eeb1b43a41e02f SHA1 d2d77aef1db6fd058276d5cd06f91fe9899ebf2a SHA256 cb74597a28823b1e8e6190061edeede72612d205e64677715f9a6c77586c5081
+AUX totem-2.26.1-smclient-target-detection.patch 1420 RMD160 4808f108ff486f5dc992ce3ea7aa1ac5d0e463da SHA1 d56ea9d8bbe96cd2edf0c68607732d4a8345c29e SHA256 5270fdce107cf60566bcd3a3eac49edeb85307503cc5228bad8ddbfbfcb695b3
 DIST totem-2.20.3.tar.bz2 2194842 RMD160 4ccd9f7cca2a7380f2cc40bebf43ddf2c0678c6f SHA1 a3ae4b9f6cabf4e09b192840b92f02da42aea021 SHA256 9d51de9549c9913f91c34986f31edf55f7604e2f784e9ceea783f6102b140897
-DIST totem-2.22.2.tar.bz2 2403730 RMD160 0c0de7fbcf1495158be7fa7850b52ca982eba734 SHA1 c552809554bf341bbe2e6cafd453e019efc7cb44 SHA256 7dd755e3b9a9610989661bfe7e09388e67ba6aca960c33e65e6a39682c00ffd4
 DIST totem-2.24.3.tar.bz2 2545808 RMD160 0598c20f7adc3d6c088cf37456641add8925424b SHA1 b398b37dc54e6a48e2871b5fd0e11ff1dfff37e5 SHA256 235a2e39959e7da3dc49f5d1d9c7259a74047d32a52b0eefeec5265174769836
 DIST totem-2.24.4.tar.bz2 2603181 RMD160 42bfbace2d213c7c51adcc4d72852d7793928472 SHA1 0fadda7c9eb70f3407866b18f97a9757ed65c6a2 SHA256 31d30ec19c11a22c9ce4d9923388a9c750c6afd92158a0070856a8e88aabaaa3
-EBUILD totem-2.18.3.ebuild 4526 RMD160 2cb5868dbe90a6699bf4131c1a6ff07b4377fca3 SHA1 799b2e1befa2d63117a3f03fe241d5d14dfe283d SHA256 823f68ee18f6b480931c9f159c3d6e940a03a531b3a17583fc648a856c32e063
-EBUILD totem-2.20.3.ebuild 5087 RMD160 204318623a1c61b72f417151ad5f9325ae8ee26a SHA1 3a8ea1ba21f894378111d4050cac79ac77ab0ec4 SHA256 2b6adfc58e052ab2f869ed0ee709961e5ce0861d4bf08954045bec9205d41562
-EBUILD totem-2.22.2-r1.ebuild 4551 RMD160 2eab1fe5ca1be4cd660e225ff96c26e9ea5a9d70 SHA1 9a59dc3199249c23ff93fe845010dc21ced02072 SHA256 bb1df92fa854c5d88e9dea345cdf8293efce8c2fd2f69815eba4ce542fc48c8f
+DIST totem-2.26.2.tar.bz2 3099034 RMD160 ec6778868dfb0cb7cdc69743e87248e1ec0634e5 SHA1 17103cf33a06190b83287a10ad38562ce9c737c5 SHA256 3244e4555a67caf8b5b4d38d2c5cf1c3609719243de55630c3ed1c0b3ec56b06
+EBUILD totem-2.20.3.ebuild 5032 RMD160 2b784ab3e1fe07fc5846e3f0e241c34a1de2a3d0 SHA1 df543761b7eb778820057231ed5adac85231fca3 SHA256 ff7ffe9233c8c168288118d3c55e520c0d6f955804a0a3c13ad292d580392320
 EBUILD totem-2.24.3.ebuild 4118 RMD160 bb761f52a5a283d649f2047ab6628bc6ea1582cd SHA1 23cacd8f52bddd0634557fae39b2ede0293e8929 SHA256 ab17b9d0edae61f91e8a68a8dfa8f52101346222139e59bce428d410ac686b28
 EBUILD totem-2.24.4-r1.ebuild 4158 RMD160 118ba517c8f04414fa4408400a4272571220528f SHA1 a02869b9c0d2bf4036aa1c5f27464886a6576886 SHA256 d8e2177d7bd664038d0f7225d8fe4a4b4d82b719408ff206d65d9495f2943d9a
-EBUILD totem-2.24.4.ebuild 4125 RMD160 58d136fccbef426b4630834a19c806398392088e SHA1 ba2c663fcf9d66a2a5fd948e618189cb7db72b96 SHA256 f138d0f031f11178ea0feb5068494929a5dd9701a40fd7fb75cc136019527db4
-MISC ChangeLog 34205 RMD160 be9f79e86919f5babe0390eddcdf39e09a023052 SHA1 b02e29c72d7dd07fac69ec87c94cdf9dce1828c1 SHA256 a7913ba9d191c89edaf61993a7859ddb5df80320ecdef043e3d16436876829a8
+EBUILD totem-2.26.2.ebuild 4393 RMD160 dba6ca35c76dfb15cf8dcee7a8c6ff82561b23fd SHA1 0ce9773938361c844ff77c0a8081f19fde636201 SHA256 ebbc400f6342c3af2bbeff33e20699d5ec4c7e2b444d17b877f575dba7236b98
+MISC ChangeLog 34531 RMD160 848191a94c1dfc7913f4fb02ae6915857930c94b SHA1 8497430f44d8661b7c8b82c38c1e9e7476475ffb SHA256 bb154530cdc2702307c5817d2774a6f1889a0be3e4c7d3b7416b2ac045462512
 MISC metadata.xml 1766 RMD160 44965691ce5fe28964c2a196ea64fbaa4eaae9b5 SHA1 f134e8d940dbbe4c28c9953d1e564578fc89d88a SHA256 1e2cf36fd98de416b771a195686b658e4e0b74bb16f25dd780cff39486966fb5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoYbZ4ACgkQ1fmVwcYIWAYT7gCfRxn8g6gHQF9H2S54gnVRYcWg
+BSMAn2BmL6jSwnCEOCDm6Q5gSlgWQz+V
+=vdzX
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..6be089a170f3
--- /dev/null
+++ b/media-video/totem/files/totem-2.26.1-smclient-target-detection.patch
@@ -0,0 +1,46 @@
+---
+ 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/totem-2.18.3.ebuild b/media-video/totem/totem-2.18.3.ebuild
deleted file mode 100644
index 060fc50cfefc..000000000000
--- a/media-video/totem/totem-2.18.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.18.3.ebuild,v 1.10 2008/10/05 21:28:52 eva Exp $
-
-inherit autotools eutils gnome2 multilib
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-
-# No 0.10.0 release for gst-plugins-pitdfdll yet
-# IUSE="win32codecs"
-
-IUSE="a52 debug dvd ffmpeg flac gnome hal lirc mad mpeg nsplugin nvtv ogg seamonkey theora vorbis xulrunner xv"
-
-RDEPEND=">=dev-libs/glib-2.12
-	 >=x11-libs/gtk+-2.10
-	 >=gnome-base/gconf-2.0
-	 >=gnome-base/libglade-2.0
-	 >=gnome-base/gnome-vfs-2.10
-	 >=x11-themes/gnome-icon-theme-2.15.90
-	 >=x11-libs/startup-notification-0.8
-	   app-text/iso-codes
-	   dev-libs/libxml2
-	 >=dev-libs/dbus-glib-0.71
-	 >=media-libs/gstreamer-0.10.6
-	 >=media-libs/gst-plugins-good-0.10
-	 >=media-libs/gst-plugins-base-0.10.7
-	 >=media-plugins/gst-plugins-pango-0.10
-	 >=media-plugins/gst-plugins-gconf-0.10
-	 >=media-plugins/gst-plugins-gnomevfs-0.10
-
-	 x11-libs/libX11
-	 x11-libs/libXtst
-	 >=x11-libs/libXrandr-1.1.1
-	 >=x11-libs/libXxf86vm-1.0.1
-
-	 gnome? (
-				>=gnome-base/libgnome-2.14
-				>=gnome-base/libgnomeui-2.4
-				>=gnome-base/gnome-desktop-2.2
-				>=gnome-base/nautilus-2.10
-			)
-	 hal? ( =sys-apps/hal-0.5* )
-	 lirc? ( app-misc/lirc )
-	 nsplugin?	(
-				xulrunner? ( =net-libs/xulrunner-1.8* )
-				!xulrunner?	(
-								seamonkey? ( =www-client/seamonkey-1* )
-								!seamonkey? ( =www-client/mozilla-firefox-2* )
-							)
-				>=x11-misc/shared-mime-info-0.17
-				>=x11-libs/startup-notification-0.8
-				)
-	 nvtv? ( >=media-tv/nvtv-0.4.5 )
-
-	 a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
-	 dvd? (
-				>=media-libs/gst-plugins-ugly-0.10
-				>=media-plugins/gst-plugins-a52dec-0.10
-				>=media-plugins/gst-plugins-dvdread-0.10
-				>=media-plugins/gst-plugins-mpeg2dec-0.10
-			)
-	 !sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) )
-	 flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	 mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	 mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 )
-	 ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	 theora? (
-				>=media-plugins/gst-plugins-ogg-0.10
-				>=media-plugins/gst-plugins-theora-0.10
-			 )
-	 vorbis? (
-				>=media-plugins/gst-plugins-ogg-0.10
-				>=media-plugins/gst-plugins-vorbis-0.10
-			 )
-	 xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )
-	>=media-plugins/gst-plugins-x-0.10"
-
-# this belongs above xv? above.
-# win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 )
-
-DEPEND="${RDEPEND}
-	  x11-proto/xproto
-	  x11-proto/inputproto
-	  app-text/scrollkeeper
-	  gnome-base/gnome-common
-	  app-text/gnome-doc-utils
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.20"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	# use global mozilla plugin dir
-	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
-	G2CONF="${G2CONF} --disable-vanity --enable-gstreamer --with-dbus"
-
-	if use gnome ; then
-	    G2CONF="${G2CONF} --disable-gtk --enable-nautilus"
-	else
-	    G2CONF="${G2CONF} --enable-gtk"
-	fi
-
-	if use nsplugin ; then
-	    G2CONF="${G2CONF} --enable-browser-plugins"
-		if use xulrunner ; then
-			G2CONF="${G2CONF} --with-gecko=xulrunner"
-		elif use seamonkey ; then
-			G2CONF="${G2CONF} --with-gecko=seamonkey"
-		else
-			G2CONF="${G2CONF} --with-gecko=firefox"
-		fi
-	else
-	    G2CONF="${G2CONF} --disable-browser-plugins"
-	fi
-
-	G2CONF="${G2CONF} \
-		$(use_enable debug) \
-		$(use_with hal) \
-		$(use_enable lirc) \
-		$(use_enable nvtv)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Remove the intltoolize call when tarballs are made with >=intltool-0.35.5
-	intltoolize --force || die
-
-	if use nsplugin ; then
-		epatch "${FILESDIR}"/${PN}-2.18.1-browser-plugins.patch
-		eautoreconf
-	fi
-
-	# Remove this when POTFILES.in will be fixed
-	echo "data/totem-handlers.schemas.in" >> "${S}"/po/POTFILES.skip
-	echo "data/totem-video-thumbnail.schemas.in" >> "${S}"/po/POTFILES.skip
-	echo "data/totem.desktop.in" >> "${S}"/po/POTFILES.skip
-	echo "data/totem.desktop.in.in" >> "${S}"/po/POTFILES.skip
-	echo "data/vanity.desktop.in" >> "${S}"/po/POTFILES.skip
-}
-
-src_install() {
-	gnome2_src_install plugindir=/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_compile() {
-	#fixme: why does it need write access here, probably need to set up a fake
-	#home in /var/tmp like other pkgs do
-
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gconf"
-	addpredict "/root/.gnome2"
-
-	gnome2_src_compile
-}
diff --git a/media-video/totem/totem-2.20.3.ebuild b/media-video/totem/totem-2.20.3.ebuild
index a3f209ba5bcc..693eb9f8ef91 100644
--- a/media-video/totem/totem-2.20.3.ebuild
+++ b/media-video/totem/totem-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.3.ebuild,v 1.12 2009/04/28 14:34:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.3.ebuild,v 1.13 2009/05/23 21:41:40 eva Exp $
 
 inherit autotools eutils gnome2 multilib
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gnome.org/projects/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="hppa sh"
 
 # No 0.10.0 release for gst-plugins-pitdfdll yet
 # IUSE="win32codecs"
diff --git a/media-video/totem/totem-2.22.2-r1.ebuild b/media-video/totem/totem-2.22.2-r1.ebuild
deleted file mode 100644
index 43b72d560fed..000000000000
--- a/media-video/totem/totem-2.22.2-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.22.2-r1.ebuild,v 1.9 2008/11/13 19:33:59 ranger Exp $
-
-inherit autotools eutils gnome2 multilib
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="bluetooth debug galago gnome lirc nautilus nsplugin nvtv python seamonkey tracker xulrunner"
-
-# TODO:
-# easy-publish-and-consume is not in tree (epc)
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# Youtube plugin as been far too unstable in my tests to be enabled for now
-
-RDEPEND=">=dev-libs/glib-2.15
-		 >=x11-libs/gtk+-2.12.6
-		 >=gnome-base/gconf-2.0
-		 >=gnome-base/gnome-vfs-2.16
-		 >=dev-libs/totem-pl-parser-2.21.90
-		 >=x11-themes/gnome-icon-theme-2.16
-		   app-text/iso-codes
-		   dev-libs/libxml2
-		 >=dev-libs/dbus-glib-0.71
-		 >=media-libs/gstreamer-0.10.16
-		 >=media-libs/gst-plugins-good-0.10
-		 >=media-libs/gst-plugins-base-0.10.12
-		 >=media-plugins/gst-plugins-pango-0.10
-		 >=media-plugins/gst-plugins-gconf-0.10
-		 >=media-plugins/gst-plugins-gnomevfs-0.10
-
-		 >=media-plugins/gst-plugins-x-0.10
-		 >=media-plugins/gst-plugins-meta-0.10-r2
-
-		 x11-libs/libX11
-		 x11-libs/libXtst
-		 >=x11-libs/libXrandr-1.1.1
-		 >=x11-libs/libXxf86vm-1.0.1
-
-		 bluetooth? ( net-wireless/bluez-libs )
-		 galago? ( >=dev-libs/libgalago-0.5.2 )
-		 gnome? (
-					>=gnome-base/libgnome-2.14
-					>=gnome-base/libgnomeui-2.4
-				)
-		 lirc? ( app-misc/lirc )
-		 nautilus? ( >=gnome-base/nautilus-2.10 )
-		 nsplugin?	(
-						xulrunner? ( =net-libs/xulrunner-1.8* )
-						!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
-						!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
-						>=x11-misc/shared-mime-info-0.22
-						>=x11-libs/startup-notification-0.8
-					)
-		 nvtv? ( >=media-tv/nvtv-0.4.5 )
-		 python? ( >=dev-python/pygtk-2.12 >=dev-python/gdata-1 )
-		 tracker? ( >=app-misc/tracker-0.5.3 >=gnome-base/libgnomeui-2 )"
-DEPEND="${RDEPEND}
-		  x11-proto/xproto
-		  x11-proto/xextproto
-		  x11-proto/xf86vidmodeproto
-		  app-text/scrollkeeper
-		  gnome-base/gnome-common
-		  app-text/gnome-doc-utils
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.20"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	if use python ; then
-		if ! built_with_use --missing false dev-lang/python threads ; then
-			if built_with_use --missing true dev-lang/python nothreads ; then
-				elog "totem's python support requires that python be built with threading support"
-				elog "Please rebuild python with threading support and then build totem again."
-				eerror "python built without threading support"
-			fi
-		fi
-	fi
-
-	# use global mozilla plugin dir
-	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
-	G2CONF="${G2CONF} --disable-vala --with-dbus"
-	G2CONF="${G2CONF} --enable-easy-codec-installation"
-
-	if use nsplugin ; then
-		G2CONF="${G2CONF} --enable-browser-plugins"
-
-		if use xulrunner ; then
-			G2CONF="${G2CONF} --with-gecko=xulrunner"
-		elif use seamonkey ; then
-			G2CONF="${G2CONF} --with-gecko=seamonkey"
-		else
-			G2CONF="${G2CONF} --with-gecko=firefox"
-		fi
-	else
-		G2CONF="${G2CONF} --disable-browser-plugins"
-	fi
-
-	# Plugin Configuration
-	G2CONF="${G2CONF} PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
-
-	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto"
-	use bluetooth && plugins="${plugins},bemused"
-	use galago && plugins="${plugins},galago"
-	use lirc && plugins="${plugins},lirc"
-	#use python && plugins="${plugins},youtube"
-	use tracker && plugins="${plugins},tracker"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	G2CONF="${G2CONF}
-			$(use_enable debug)
-			$(use_enable nautilus)
-			$(use_enable nvtv)
-			$(use_enable python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if use nsplugin && ! use xulrunner && ! use seamonkey ; then
-		epatch "${FILESDIR}/${PN}-2.20.1-xpcom-hack.patch"
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.22.2-fix-python-and-libtool-2.2.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	#fixme: why does it need write access here, probably need to set up a fake
-	#home in /var/tmp like other pkgs do
-
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gconf"
-	addpredict "/root/.gnome2"
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn
-	ewarn "If totem doesn't play some video format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
diff --git a/media-video/totem/totem-2.24.4.ebuild b/media-video/totem/totem-2.26.2.ebuild
index 0e637a0ee2ba..af6e3b1ed3e4 100644
--- a/media-video/totem/totem-2.24.4.ebuild
+++ b/media-video/totem/totem-2.26.2.ebuild
@@ -1,60 +1,67 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.24.4.ebuild,v 1.3 2009/04/04 15:48:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.2.ebuild,v 1.1 2009/05/23 21:41:40 eva Exp $
 
-inherit eutils gnome2 multilib python
+EAPI="2"
+
+inherit autotools eutils gnome2 multilib python
 
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="http://gnome.org/projects/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="bluetooth debug galago gnome lirc nautilus nsplugin nvtv python tracker"
+IUSE="bluetooth debug doc galago lirc nautilus nsplugin python tracker"
 
 # TODO:
 # easy-publish-and-consume is not in tree (epc)
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
-# youtube plugins requires gst-plugins-soup
-# check gmyth requirement ?
+# check gmyth requirement ? -> waiting for updates in tree
+# coherence plugin not enabled until we have deps in tree
 
+# youtube plugin depends on gst-plugins-soup
 RDEPEND=">=dev-libs/glib-2.15
 	>=x11-libs/gtk+-2.13.0
 	>=gnome-base/gconf-2.0
 	>=dev-libs/totem-pl-parser-2.23.91
 	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
 	app-text/iso-codes
-	dev-libs/libxml2
+	>=dev-libs/libxml2-2.6
 	>=dev-libs/dbus-glib-0.71
 	>=media-libs/gstreamer-0.10.16
 	>=media-libs/gst-plugins-good-0.10
 	>=media-libs/gst-plugins-base-0.10.12
-	>=media-plugins/gst-plugins-pango-0.10
 	>=media-plugins/gst-plugins-gconf-0.10
-	>=media-plugins/gst-plugins-gio-0.10
 
+	>=media-plugins/gst-plugins-gio-0.10
+	>=media-plugins/gst-plugins-pango-0.10
 	>=media-plugins/gst-plugins-x-0.10
 	>=media-plugins/gst-plugins-meta-0.10-r2
 
+	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-libs )
+	bluetooth? ( || (
+		net-wireless/bluez
+		net-wireless/bluez-libs ) )
 	galago? ( >=dev-libs/libgalago-0.5.2 )
-	gnome? (
-		>=gnome-base/libgnome-2.14
-		>=gnome-base/libgnomeui-2.4	)
 	lirc? ( app-misc/lirc )
 	nautilus? ( >=gnome-base/nautilus-2.10 )
-	nsplugin? (
-		>=x11-misc/shared-mime-info-0.22
-		>=x11-libs/startup-notification-0.8	)
-	nvtv? ( >=media-tv/nvtv-0.4.5 )
-	python? ( >=dev-python/pygtk-2.12 >=dev-python/gdata-1 )
-	tracker? ( >=app-misc/tracker-0.5.3 >=gnome-base/libgnomeui-2 )"
+	python? (
+		dev-lang/python[threads]
+		>=dev-python/pygtk-2.12
+		dev-python/pyxdg
+		dev-python/gdata
+		dev-python/gst-python
+		dev-python/gconf-python
+		media-plugins/gst-plugins-soup )
+	tracker? ( >=app-misc/tracker-0.5.3 )"
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto
@@ -63,43 +70,35 @@ DEPEND="${RDEPEND}
 	gnome-base/gnome-common
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.20"
+	>=dev-util/pkgconfig-0.20
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.11 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-pkg_setup() {
-	if use python ; then
-		if ! built_with_use --missing false dev-lang/python threads ; then
-			if built_with_use --missing true dev-lang/python nothreads ; then
-				elog "totem's python support requires that python be built with threading support"
-				elog "Please rebuild python with threading support and then build totem again."
-				eerror "python built without threading support"
-			fi
-		fi
-	fi
+# FIXME: tests broken with USE="-doc" upstream bug #577774
+RESTRICT="test"
 
+pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-schemas-install
 		--disable-vala
 		--with-dbus
+		--with-smclient
 		--enable-easy-codec-installation
 		$(use_enable nsplugin browser-plugins)"
 
 	# Plugin configuration
 	G2CONF="${G2CONF}
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
-	    PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
+		PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
 
-	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto"
+	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot"
 	use bluetooth && plugins="${plugins},bemused"
 	use galago && plugins="${plugins},galago"
 	use lirc && plugins="${plugins},lirc"
-
-	# Test again before pushing to the tree.
-	# use python && plugins="${plugins},youtube"
-	use python && plugins="${plugins},pythonconsole"
-
+	use python && plugins="${plugins},youtube,opensubtitles,jamendo,pythonconsole"
 	use tracker && plugins="${plugins},tracker"
 
 	G2CONF="${G2CONF} --with-plugins=${plugins}"
@@ -107,19 +106,33 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable nautilus)
-		$(use_enable nvtv)
 		$(use_enable python)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix broken smclient option passing
+	epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch"
+
+	# FIXME: tarball generated with broken gtk-doc, revisit me.
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
 }
 
-src_compile() {
+src_configure() {
 	# FIXME: why does it need write access here, probably need to set up a fake
 	# home in /var/tmp like other pkgs do
 
@@ -127,12 +140,15 @@ src_compile() {
 	addpredict "$(unset HOME; echo ~)/.gconfd"
 	addpredict "$(unset HOME; echo ~)/.gnome2"
 
-	gnome2_src_compile
+	gnome2_src_configure
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	use python && python_mod_optimize /usr/$(get_libdir)/totem/plugins
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/$(get_libdir)/totem/plugins
+	fi
 
 	ewarn
 	ewarn "If totem doesn't play some video format, please check your"
@@ -142,5 +158,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
 }