Try to handle a bit better bug #316409: youtube plugin needs --enable-python to be passed due upstream bug #572713, we was workarounding this defaulting to USE=+python, after this change, people will be able to set USE=-python to skip python based plugins but python RDEPEND will still be pulled in by 'youtube' USE flag as it still needs it. Also add some comments about vala plugins that will probably be enabled in totem-3.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

3 files changed, 217 insertions, 5 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 4c543ba445a4..4db2a704e18c 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.318 2011/04/02 12:03:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.319 2011/06/05 12:55:10 pacho Exp $
+
+*totem-2.32.0-r2 (05 Jun 2011)
+
+  05 Jun 2011; Pacho Ramos <pacho@gentoo.org> +totem-2.32.0-r2.ebuild:
+  Try to handle a bit better bug #316409: youtube plugin needs --enable-python
+  to be passed due upstream bug #572713, we was workarounding this defaulting
+  to USE=+python, after this change, people will be able to set USE=-python to
+  skip python based plugins but python RDEPEND will still be pulled in by
+  'youtube' USE flag as it still needs it. Also add some comments about vala
+  plugins that will probably be enabled in totem-3.
 
 *totem-2.32.0-r1 (02 Apr 2011)
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 0116f57e856c..b806939e5723 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -6,13 +6,14 @@ AUX totem-2.32.0-smclient-target-detection.patch 1546 RMD160 d26dad41d63e3ce2c81
 DIST totem-2.32.0-patches.tar.bz2 13355 RMD160 9974653c46247d37d14f441c8d6f458e2e8fbd2f SHA1 1c575377a610ca672b670107c822970f90edc356 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70bbdf018418dfc7d0fa8bd28929335a30
 DIST totem-2.32.0.tar.bz2 3278758 RMD160 5312aa67e3ff611be0626fd72da66e1c26d6eb4d SHA1 46589181aee29e021d686a4804bbbb04149a61dc SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
 EBUILD totem-2.32.0-r1.ebuild 5707 RMD160 2d8e792aede6b5f9eee5f7284917af891889bfdc SHA1 760ccb6b6bda85efcb3f301def8639fbd956554b SHA256 7368070bc25dcecef26559e11192f47254e78cfec5da261ed58229846d33ddae
+EBUILD totem-2.32.0-r2.ebuild 5907 RMD160 680cdb58bb1c362f705a55c07b8e2e02f1f2d161 SHA1 2b397b57895f3dcc44451bc69989f5d1d09828f2 SHA256 18a2ead5a8a0df291b11a55627869a672823f02a927a06b7f9ca69a8a8a93c77
 EBUILD totem-2.32.0.ebuild 5437 RMD160 b6632cc8b3126fd92c3e99f6b78f732a3b3c5efe SHA1 0c3119d4109c23277369fb29c0135bfd13dfcb37 SHA256 cf297857d04a4244027f7190212a6ea06f469f3eb117abb577093347e6cffb51
-MISC ChangeLog 46503 RMD160 7d4fd7916e76c40e775bae961cc4863d0a7fc1b4 SHA1 d6b24141f6edbcc79195f7202ae4efeef6949c0d SHA256 a39cf459a625039046763d1704b81d00489067352719676ebba000d98e4153e9
+MISC ChangeLog 47046 RMD160 2eb39125a0076c1916e4376713b59baedaab3d16 SHA1 4d28dc0e7e0e921952989f9f37b3d3294664ffe2 SHA256 e96df5b58d333883ec08bec7df8ca3208ccbc6e02eae998ba050a7364b31cb44
 MISC metadata.xml 1399 RMD160 c61f89b5dbb8f7abd73a80837bd8c848c1a5cb88 SHA1 72d3f98212c3ecdce00a048558ce32b67e9bfcd0 SHA256 0abbcbe8749025bed45c0ada8a502c2a9e8a77c546d7740e58d81608a23c4bf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2XEKwACgkQCaWpQKGI+9S0TQCffC8kKABviDBzo9C+1FKyS0jR
-cuIAn3debzLv3McWGNh/awy2PkBEFRio
-=Jrd+
+iEYEARECAAYFAk3rfLQACgkQCaWpQKGI+9R9fgCgg1y2PqqRxHL/DK32C1Ymzj0N
+KwYAmwdFKNleGloBprOXPKOENFCYKYZ/
+=LZNr
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild
new file mode 100644
index 000000000000..3547a4034812
--- /dev/null
+++ b/media-video/totem/totem-2.32.0-r2.ebuild
@@ -0,0 +1,201 @@
+# 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-r2.ebuild,v 1.1 2011/06/05 12:55:10 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"
+
+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, upstream supports it better in totem-3
+PYTHON_DEPS=">=dev-python/pygtk-2.12:2
+	dev-python/pyxdg
+	dev-python/gst-python:0.10
+	dev-python/dbus-python
+	dev-python/gconf-python: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.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? ( ${PYTHON_DEPS} )
+	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]
+		${PYTHON_DEPS} )"
+#	vala? ( dev-lang/vala:0.12 )"
+# 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 vala && plugins="${plugins},sample-vala"
+	#use zeroconf && plugins="${plugins},publish"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable nautilus)
+		$(use_enable python)"
+
+	# We need to --enable-python to make youtube plugin work as reported in bug #316409
+	# This won't be solved until upstream fixes their bug #572713
+	use youtube && G2CONF="${G2CONF} --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
+}