Bump including upstream fixes

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

4 files changed, 209 insertions, 8 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 7016e56c411b..63786e23f864 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.280 2010/04/16 18:37:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.281 2010/05/02 13:40:11 pacho Exp $
+
+*totem-2.28.5-r4 (02 May 2010)
+*totem-2.28.5-r3 (02 May 2010)
+
+  02 May 2010; Pacho Ramos <pacho@gentoo.org> -totem-2.28.5-r2.ebuild,
+  +totem-2.28.5-r3.ebuild, +totem-2.28.5-r4.ebuild:
+  Revision bump to include upstream patches committed to gnome-2.28 branch
+  fixing tons of bugs like problems playing through gvfs mounts, youtube
+  updates and many others. For full descriptions feel free to read each
+  patch header. This also auto-enables python USE to workaround bug #316409
+  until a fix is found. Dropping old testing version.
 
 *totem-2.28.5-r2 (16 Apr 2010)
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 9faaa208e35d..cf133a5eae85 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -7,17 +7,19 @@ AUX totem-2.26.4-youtube-plug-play-vids.patch 888 RMD160 b4e28b2818aa588e257cf5b
 AUX totem-2.26.5-firefox-plugin-apple-trailers.patch 2690 RMD160 647f88df1373c20b1034caa746b456f910afd34f SHA1 a925115dcc1c33b397c0cb2ea561c5a48f402471 SHA256 e89197f6c20c6a525f3c60ade071b918efeaba4fb9178f859a733a72e8bd6e85
 DIST totem-2.26.3.tar.bz2 3193956 RMD160 f265ec3997c130f28bf5e5455c0aef6921e71ece SHA1 ea6fa7244eb993a3038bc76f5e561c8a0661466c SHA256 ae1bd6682385ad401effda4a856f4ba8150b5ef4eab113a288b29e9335170d70
 DIST totem-2.26.5.tar.bz2 3198042 RMD160 174e91dad2f51c908e4b777e93003c6888fd2829 SHA1 34c4a701f1cee440b397ead761de56e08ce97da1 SHA256 33c69497eff649d86b0a710aee7a3b3cbc7cb79c55267bac88a591d62a6ffb3c
+DIST totem-2.28.5-patches.tar.bz2 11640 RMD160 aad39ff2ae08afef567150c9f1500083de9972c6 SHA1 e59c0f614a24741e7b0095cee7a5e5563b4db3c4 SHA256 e2fb840164b2be1bbcf18d97e52e5606cf280306373305b58d128e899367eaf0
 DIST totem-2.28.5.tar.bz2 3083946 RMD160 20fa09187a82380d7b7d19c2fb5e8a5a4475307e SHA1 1653528d66a1f11da4bc8f66746828c4a31343d6 SHA256 c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063
 EBUILD totem-2.26.3-r1.ebuild 4609 RMD160 e41975bcac1ea766ef7f629ba4b55df615fe76da SHA1 a9e50062bc439695eefe24001b85c354ea36ee0f SHA256 03eb45c8edc15ff1e0ea5c49038f20eb395f7187f8789eeb726de90e57b45f03
 EBUILD totem-2.26.5-r1.ebuild 4696 RMD160 7d77d3ad4fe8f6668b50483d9900164ed86e710c SHA1 235f5b97e0b74d0e6fc905767a97d19c8160d193 SHA256 620e905f88d77881e5bbc643862031cbfddd05140d548d7ea72ed6f7d07dde2c
 EBUILD totem-2.28.5-r1.ebuild 4574 RMD160 7d622038273cd63bdd9bf1aeed9ef80cd19f19e9 SHA1 dad2c1383190adc652a6986239a8354a56bff304 SHA256 e49b86b854d35b4d3bf4911f75bdfe3d41b65cc46ac611bec7f54648f65d7599
-EBUILD totem-2.28.5-r2.ebuild 4690 RMD160 c28da4e014bda5e7b439f439b9e488746d872d3a SHA1 a6c2420fcb868f8fd938eebe7eb5a1b60140ed37 SHA256 35f0a4438a86c28da32a99217f5e20f4b9bffbe99cad8e5af7d743df274690e9
-MISC ChangeLog 39951 RMD160 314282cbd149b03c928e92e4fc0afca93785f66d SHA1 a3b0a27f4b7e3263338700d01145a4ac189655a1 SHA256 de8835d9072afb0a6902a4c7cbed47c766b22dec14d2facae748b5c864c097ef
+EBUILD totem-2.28.5-r3.ebuild 4893 RMD160 b6276079f22ce701b0c09b8f1053c9bbcc57ef06 SHA1 e406b09afb3abbeccdfb72db3814aa81159c489e SHA256 3620cc9789f6fbc86f7a53335ac3756be7c09187d248d843e8f49ae87dfbca2b
+EBUILD totem-2.28.5-r4.ebuild 5009 RMD160 86ddfc5292f627d9be81a9425c91e01e046a11e1 SHA1 6bfd9db7724eca09003ba7cfbc58d77e6b1e955d SHA256 bad172a093a93cafbbc96ecfec4262cb184e1740eb17c4be6d66b9b43ebec2fa
+MISC ChangeLog 40488 RMD160 16f7e9ec59ee52b5c8af8d835760bd915d927d7a SHA1 8ea4e20b33a91063def5b2e3e9668730198ec9f1 SHA256 260d4684caa9080d14d5f6547d6befe2e1259b1ec5513c846f034e34e113e208
 MISC metadata.xml 1481 RMD160 10623ca424a3144b43dbbb7c113854ceb5035940 SHA1 190bf0601c8f7a7cec4475aca682e3e061958996 SHA256 977a7285e472da55cc584e3d5b064f54f73addf7ff8b67ab345912e810d57600
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvIrlQACgkQCaWpQKGI+9SKXwCfWSHJLwZN60oP2Zzp9cKsfg1I
-KAAAnAv4AV/UETEt4uAEpPQV3bODnd7i
-=hd/H
+iEYEARECAAYFAkvdgMQACgkQCaWpQKGI+9RyXQCePVO/Y26C7K5dCe6MwTnT+fLT
+sYIAn3YXnG4AZ5bGloakAX2fTAwzyB+z
+=r2fB
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.28.5-r3.ebuild b/media-video/totem/totem-2.28.5-r3.ebuild
new file mode 100644
index 000000000000..78bd99e5ca38
--- /dev/null
+++ b/media-video/totem/totem-2.28.5-r3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.5-r3.ebuild,v 1.1 2010/05/02 13:40:11 pacho Exp $
+
+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="~amd64 ~x86 ~x86-fbsd"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-patches.tar.bz2"
+
+# 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 +youtube" #zeroconf
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# check gmyth requirement ? -> waiting for updates in tree
+# coherence plugin not enabled until we have deps in tree
+RDEPEND=">=dev-libs/glib-2.15
+	>=x11-libs/gtk+-2.16.0
+	>=gnome-base/gconf-2.0
+	>=dev-libs/totem-pl-parser-2.27.0
+	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
+	app-text/iso-codes
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/dbus-glib-0.71
+	>=media-libs/gstreamer-0.10.25
+	>=media-libs/gst-plugins-good-0.10
+	>=media-libs/gst-plugins-base-0.10.25
+	>=media-plugins/gst-plugins-gconf-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-r2
+
+	dev-libs/libunique
+	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
+		net-wireless/bluez-libs ) )
+	galago? ( >=dev-libs/libgalago-0.5.2 )
+	iplayer? (
+		dev-python/pygobject
+		dev-python/pygtk
+		dev-python/httplib2
+		dev-python/feedparser
+		dev-python/beautifulsoup )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.10 )
+	python? (
+		dev-lang/python[threads]
+		>=dev-python/pygtk-2.12
+		dev-python/pyxdg
+		dev-python/gst-python
+		dev-python/dbus-python
+		dev-python/gconf-python )
+	youtube? (
+		>=dev-libs/libgdata-0.4.0
+		media-plugins/gst-plugins-soup )"
+# FIXME: freezes totem
+#	zeroconf? ( >=net-libs/libepc-0.3 )
+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.40
+	>=dev-util/pkgconfig-0.20
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.11 )
+	app-text/docbook-xml-dtd:4.5"
+# docbook-xml-dtd is needed for user doc
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	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"
+	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 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)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix broken smclient option passing
+	epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch"
+
+	# Apply upstream patches committed to gnome-2.28 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"
+
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+	# Installed for plugins, but they're dlopen()-ed
+	# firefox, totem as well as nautilus
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+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-2.28.5-r2.ebuild b/media-video/totem/totem-2.28.5-r4.ebuild
index a4f0bf270ff9..60fe11b01ae6 100644
--- a/media-video/totem/totem-2.28.5-r2.ebuild
+++ b/media-video/totem/totem-2.28.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.5-r2.ebuild,v 1.1 2010/04/16 18:37:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.5-r4.ebuild,v 1.1 2010/05/02 13:40:11 pacho Exp $
 
 EAPI="2"
 
@@ -13,7 +13,13 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
-IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin python tracker +youtube" #zeroconf
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-patches.tar.bz2"
+
+# 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 +youtube" #zeroconf
 
 # TODO:
 # Cone (VLC) plugin needs someone with the right setup (remi ?)
@@ -129,6 +135,9 @@ src_prepare() {
 	# Fix broken smclient option passing
 	epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch"
 
+	# Apply upstream patches committed to gnome-2.28 branch
+	epatch "${WORKDIR}"/${P}-patches/*.patch
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf