[gentoo-commits] proj/gnome:master commit in: media-video/totem/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     a2e3524adb07350efc9fbd24127c385a0194993f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 15:43:58 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:03:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a2e3524a

media-video/totem: QAed

	* Sync with gentoo-x86 changes

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 media-video/totem/totem-3.0.0.ebuild |   54 ++++++++++++++++-----------------
 media-video/totem/totem-9999.ebuild  |   54 ++++++++++++++++-----------------
 2 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/media-video/totem/totem-3.0.0.ebuild b/media-video/totem/totem-3.0.0.ebuild
index 3907ae8..cc352c8 100644
--- a/media-video/totem/totem-3.0.0.ebuild
+++ b/media-video/totem/totem-3.0.0.ebuild
@@ -2,33 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
 
-EAPI="2"
+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
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
+HOMEPAGE="http://projects.gnome.org/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-IUSE="bluetooth debug doc lirc +introspection iplayer nautilus nsplugin
-+python tracker +youtube vala zeroconf"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
+IUSE="bluetooth doc +introspection iplayer lirc nautilus nsplugin +python tracker +youtube vala zeroconf"
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
 # coherence plugin broken upstream
 #
 # FIXME: Automagic tracker-0.9.0
@@ -53,37 +53,36 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
 	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 )
-	nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
-
-	bluetooth? ( || (
-		net-wireless/bluez
-		net-wireless/bluez-libs ) )
 	lirc? ( app-misc/lirc )
 	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	tracker? ( >=app-misc/tracker-0.9.34 )
-	youtube? (
-		>=dev-libs/libgdata-0.7.0
-		net-libs/libsoup:2.4
-		media-plugins/gst-plugins-soup )
-
+	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
+		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}
@@ -92,20 +91,17 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xf86vidmodeproto
 	app-text/scrollkeeper
-	gnome-base/gnome-common
 	>=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 )
-	app-text/docbook-xml-dtd:4.5"
+	doc? ( >=dev-util/gtk-doc-1.14 )"
 # docbook-xml-dtd is needed for user doc
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
 pkg_setup() {
-	python_set_active_version 2
-
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-maintainer-mode
 		--disable-run-in-source-tree
@@ -113,9 +109,8 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-static
 		--with-dbus
-		--with-smclient=xsmp
+		--with-smclient
 		--enable-easy-codec-installation
-		$(use_enable debug)
 		$(use_enable introspection)
 		$(use_enable nautilus)
 		$(use_enable nsplugin browser-plugins)
@@ -125,7 +120,7 @@ pkg_setup() {
 		VALAC=$(type -P valac-0.12)
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
 
-	# Disabled: coherence_upnp, sample-python, zeitgeist-dp
+	# 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"
@@ -139,12 +134,13 @@ pkg_setup() {
 	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
-	gnome2_src_prepare
 
 	# Fix broken smclient option passing
 	# FIXME: File a bug for this
@@ -158,6 +154,8 @@ src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	gnome2_src_prepare
 }
 
 pkg_postinst() {

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 3907ae8..cc352c8 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -2,33 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
 
-EAPI="2"
+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
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
+HOMEPAGE="http://projects.gnome.org/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-IUSE="bluetooth debug doc lirc +introspection iplayer nautilus nsplugin
-+python tracker +youtube vala zeroconf"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
+IUSE="bluetooth doc +introspection iplayer lirc nautilus nsplugin +python tracker +youtube vala zeroconf"
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
 # coherence plugin broken upstream
 #
 # FIXME: Automagic tracker-0.9.0
@@ -53,37 +53,36 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
 	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 )
-	nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
-
-	bluetooth? ( || (
-		net-wireless/bluez
-		net-wireless/bluez-libs ) )
 	lirc? ( app-misc/lirc )
 	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	tracker? ( >=app-misc/tracker-0.9.34 )
-	youtube? (
-		>=dev-libs/libgdata-0.7.0
-		net-libs/libsoup:2.4
-		media-plugins/gst-plugins-soup )
-
+	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
+		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}
@@ -92,20 +91,17 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xf86vidmodeproto
 	app-text/scrollkeeper
-	gnome-base/gnome-common
 	>=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 )
-	app-text/docbook-xml-dtd:4.5"
+	doc? ( >=dev-util/gtk-doc-1.14 )"
 # docbook-xml-dtd is needed for user doc
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
 pkg_setup() {
-	python_set_active_version 2
-
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-maintainer-mode
 		--disable-run-in-source-tree
@@ -113,9 +109,8 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-static
 		--with-dbus
-		--with-smclient=xsmp
+		--with-smclient
 		--enable-easy-codec-installation
-		$(use_enable debug)
 		$(use_enable introspection)
 		$(use_enable nautilus)
 		$(use_enable nsplugin browser-plugins)
@@ -125,7 +120,7 @@ pkg_setup() {
 		VALAC=$(type -P valac-0.12)
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
 
-	# Disabled: coherence_upnp, sample-python, zeitgeist-dp
+	# 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"
@@ -139,12 +134,13 @@ pkg_setup() {
 	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
-	gnome2_src_prepare
 
 	# Fix broken smclient option passing
 	# FIXME: File a bug for this
@@ -158,6 +154,8 @@ src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	gnome2_src_prepare
 }
 
 pkg_postinst() {