Version bump, lots of bugfixes.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

3 files changed, 192 insertions, 5 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index e7d4bb595e0e..9ee47c3ada73 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.333 2012/02/14 04:09:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.334 2012/02/20 00:50:31 tetromino Exp $
+
+*totem-3.2.2 (20 Feb 2012)
+
+  20 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +totem-3.2.2.ebuild:
+  Version bump, lots of bugfixes.
 
   14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org> totem-3.2.1.ebuild:
   Add missing dependency on gnome-icon-theme-symbolic (bug #403503, thanks to
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index f7f29473fb8a..bb9a75b4df33 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -6,14 +6,16 @@ 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
 DIST totem-3.2.1.tar.xz 3132760 RMD160 d4283ba926f57cd253ae305cd6f67b161e9ae8c8 SHA1 36370da6475652526facd8511a8be0d615058060 SHA256 e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4
+DIST totem-3.2.2.tar.xz 3141664 RMD160 5cfa585879a9a7ed8790473a77269f4b85b035fd SHA1 65d1b267f1521432e6a7a7ba21ed186a8951b52a SHA256 b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a
 EBUILD totem-2.32.0-r2.ebuild 5926 RMD160 9943f3238018a66691f177d860b33a3ce412f00b SHA1 6a292e39e7ffe577e3ab1e47b3b72e5c52208fe7 SHA256 d6455c769d0ced73796a298227fe5e1d431c7beed49fc8818b7fa6beb52bdd09
 EBUILD totem-3.2.1.ebuild 5160 RMD160 e088037b192fd42c00828c319a9133c14589bdf4 SHA1 8c7198a3d748cc0d51e50a2b77d5355faf844b73 SHA256 8a43fb880cc27f0650396dbfbc44f5997b6bd39934a98abbca50c5b4d8f8bf54
-MISC ChangeLog 49648 RMD160 cef07416a027c99797ad76eb5bc0d9cabc340940 SHA1 fca24ac537bb3a6bbdb680a06a50ff40348ab2ae SHA256 673688becf19aa0fec3ae60d6b736195a92a4b798fd565429fe3f7d3fe7d62a0
+EBUILD totem-3.2.2.ebuild 5251 RMD160 68a6284da3296bbec62ff4756f2a4144bf992caa SHA1 2618ce4dde51a323e0880777aeba9fc6788479d8 SHA256 e8a93cf4b477d56c7c14eaff4b2e78b88a3fc42cea1cc97f1dec6d45558c4ca3
+MISC ChangeLog 49791 RMD160 47313085b4fc71f21141365ab7f7c0b6281e58dc SHA1 203d725317f7e6e1d4a9c428ac9d187b4cbf9bca SHA256 90280948c9cc097e1cb977c890e0ae13936c9fc6ecdec8e3c846e56c3bfdffc3
 MISC metadata.xml 1797 RMD160 51f30a3f7a7582cf1327e5a46b42934867a0f832 SHA1 a7600ddd8e7609c11e6e0012b891af9dc35a2aa5 SHA256 04a19965c26788a1d4240c61d0c65380040dead72790e07abfae4f2f107bcead
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk853nYACgkQdjK8w9WeBnDLUAD/Vlcu1BPkWBOmQlBIOW6FvXxt
-rKbu7MrjhosXAV0zA3gA/1R2CPLnZ1dKBY87i9lx2Ii+OFlhN8fzzPTz5FnpomMX
-=CkWN
+iF4EAREIAAYFAk9BmN0ACgkQdjK8w9WeBnD3MAD/SuSQBWIO+tL+bnEMjWMh9bp4
+w49iZtmyKVVonkz16QwA/imdU1qY3KK0hmydj8PG+d4UBqb99d/q/I8MNFKqU+pf
+=mKm7
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-3.2.2.ebuild b/media-video/totem/totem-3.2.2.ebuild
new file mode 100644
index 000000000000..1fe3d3998a29
--- /dev/null
+++ b/media-video/totem/totem-3.2.2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.1 2012/02/20 00:50:31 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+WANT_AUTOMAKE="1.11"
+PYTHON_DEPEND="python? 2:2.5"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit gnome2 multilib python
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://projects.gnome.org/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala zeitgeist" # test zeroconf
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# coherence plugin broken upstream
+#
+# FIXME: Automagic tracker-0.9.0
+# 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-1.1.0[gtk]
+	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
+	>=dev-libs/libxml2-2.6:2
+	>=media-libs/clutter-1.6.8:1.0
+	>=media-libs/clutter-gst-1.3.9:1.0
+	>=media-libs/clutter-gtk-1.0.2:1.0
+	>=media-libs/gstreamer-0.10.30:0.10
+	>=media-libs/gst-plugins-base-0.10.30:0.10
+	x11-libs/mx:1.0
+
+	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/libXxf86vm-1.0.1
+	x11-themes/gnome-icon-theme-symbolic
+
+	bluetooth? ( net-wireless/bluez )
+	grilo? ( >=media-libs/grilo-0.1.16 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	nsplugin? (
+		>=dev-libs/dbus-glib-0.82
+		>=x11-misc/shared-mime-info-0.22 )
+	python? (
+		>=dev-libs/gobject-introspection-0.6.7
+		>=dev-python/pygobject-2.90.3:3
+		>=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 ) )
+	vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
+	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] )
+	zeitgeist? ( dev-libs/libzeitgeist )"
+#	zeroconf? ( >=net-libs/libepc-0.5.0 )
+# XXX: zeroconf requires unreleased version of libepc
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	x11-proto/xproto
+	x11-proto/xextproto
+	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 )"
+#	test? ( python? ( dev-python/pylint ) )
+# docbook-xml-dtd is needed for user doc
+
+# see bug #359379
+REQUIRED_USE="python? ( introspection )
+	zeitgeist? ( vala )"
+
+# XXX: pylint checks fail, need to investigate why
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-run-in-source-tree
+		--disable-schemas-compile
+		--disable-scrollkeeper
+		--disable-static
+		--with-smclient=auto
+		--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.14)
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+	#--with-smclient=auto needed to correctly link to libICE and libSM
+
+	# Disabled: 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"
+	use bluetooth && plugins="${plugins},bemused"
+	use grilo && plugins="${plugins},grilo"
+	use iplayer && plugins="${plugins},iplayer"
+	use lirc && plugins="${plugins},lirc"
+	use nautilus && plugins="${plugins},save-file"
+	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
+	use vala && plugins="${plugins},rotation"
+	use youtube && plugins="${plugins},youtube"
+	use zeitgeist && plugins="${plugins},zeitgeist-dp"
+	# XXX: zeroconf requires unreleased version of libepc
+	# use zeroconf && plugins="${plugins},publish"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+	mkdir -p m4
+
+	#if [[ ${PV} != 9999 ]]; then
+	#	intltoolize --force --copy --automake || die "intltoolize failed"
+	#	eautoreconf
+	#fi
+
+	python_clean_py-compile_files
+
+	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
+	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+}