Bump to 3.0.1, from gnome overlay for GNOME 3

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

5 files changed, 229 insertions, 198 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 677aa3a4c5d6..18009cd7c8ab 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,13 @@
 # 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.323 2011/08/13 17:47:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.324 2011/08/16 22:34:06 nirbheek Exp $
+
+*totem-3.0.1 (16 Aug 2011)
+
+  16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -totem-2.32.0-r1.ebuild,
+  +files/totem-2.90.0-smclient-target-detection.patch, +totem-3.0.1.ebuild,
+  metadata.xml:
+  Bump to 3.0.1, from gnome overlay for GNOME 3
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org> totem-2.32.0-r2.ebuild:
   alpha/ia64/sparc 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
new file mode 100644
index 000000000000..ad6cc690e4fe
--- /dev/null
+++ b/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
@@ -0,0 +1,39 @@
+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 55541ef7aba1..f1bcb5ec3075 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="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+		for introspection</flag>
 	<flag name="iplayer">Enable BBC player support</flag>
 	<flag name="lirc">Enable support for controlling Totem with a remote control
 		using <pkg>app-misc/lirc</pkg></flag>
@@ -22,5 +24,6 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
 	<flag name="upnp">Enable DLNA support through
 		<pkg>media-video/coherence</pkg></flag>
 	<flag name="youtube">Enable youtube plugin</flag>
+	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/media-video/totem/totem-2.32.0-r1.ebuild b/media-video/totem/totem-2.32.0-r1.ebuild
deleted file mode 100644
index 4f8f75450541..000000000000
--- a/media-video/totem/totem-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# 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.32.0-r1.ebuild,v 1.1 2011/04/02 12:03:50 pacho Exp $
-
-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://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"
-
-# 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 upnp +youtube" #zeroconf
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
-# vala ( dev-lang/vala ) requires 0.7.5
-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.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.30:0.10
-	>=media-libs/gst-plugins-good-0.10: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
-	>=media-plugins/gst-plugins-gio-0.10:0.10
-	>=media-plugins/gst-plugins-pango-0.10:0.10
-	>=media-plugins/gst-plugins-x-0.10:0.10
-	>=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
-	>=x11-libs/libXrandr-1.1.1
-	>=x11-libs/libXxf86vm-1.0.1
-
-	bluetooth? ( net-wireless/bluez )
-	galago? ( >=dev-libs/libgalago-0.5.2 )
-	iplayer? (
-		dev-python/pygobject:2
-		dev-python/pygtk:2
-		dev-python/httplib2
-		dev-python/feedparser
-		dev-python/beautifulsoup )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.10 )
-	nsplugin? ( media-plugins/gst-plugins-soup:0.10 )
-	python? (
-		>=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
-		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}
-	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
-	>=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 )"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-
-# docbook-xml-dtd is needed for user doc
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-static
-		--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"
-
-	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"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable nautilus)
-		$(use_enable python)"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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
-
-	# Fix broken smclient option passing
-	epatch "${FILESDIR}/${PN}-2.32.0-smclient-target-detection.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
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-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
-
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install
-	# Installed for plugins, but they're dlopen()-ed
-	# firefox, totem as well as nautilus
-	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() {
-	gnome2_pkg_postinst
-	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"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
diff --git a/media-video/totem/totem-3.0.1.ebuild b/media-video/totem/totem-3.0.1.ebuild
new file mode 100644
index 000000000000..a070ce6bed39
--- /dev/null
+++ b/media-video/totem/totem-3.0.1.ebuild
@@ -0,0 +1,179 @@
+# 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 $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+WANT_AUTOMAKE="1.11"
+PYTHON_DEPEND="python? 2:2.4"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit autotools eutils 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"
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# coherence plugin broken upstream
+#
+# FIXME: Automagic tracker-0.9.0
+# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
+# Runtime dependency on gnome-session-2.91
+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]
+	>=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.30:0.10
+	>=media-libs/gst-plugins-base-0.10.30:0.10
+
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-taglib: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
+
+	x11-libs/libICE
+	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 )
+	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 )
+	python? (
+		>=dev-libs/gobject-introspection-0.6.7
+		>=dev-python/pygobject-2.27.0[introspection]
+		>=x11-libs/gtk+-2.91.7:3[introspection]
+		dev-python/pyxdg
+		dev-python/gst-python:0.10
+		dev-python/dbus-python
+		iplayer? (
+			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 )
+	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 )"
+
+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
+	>=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.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
+
+	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
+		--enable-easy-codec-installation
+		$(use_enable introspection)
+		$(use_enable nautilus)
+		$(use_enable nsplugin browser-plugins)
+		$(use_enable python)
+		$(use_enable python introspection)
+		$(use_enable vala)
+		VALAC=$(type -P valac-0.12)
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+	# Disabled: coherence_upnp, 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"
+	use bluetooth && plugins="${plugins},bemused"
+	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 youtube && plugins="${plugins},youtube"
+	use zeroconf && plugins="${plugins},publish"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	python_set_active_version 2
+}
+
+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
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	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"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+}