Enable support for zeitgeist plugin

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

4 files changed, 33 insertions, 36 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index a91cc23ced8f..419db9ddb91a 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # 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.330 2012/01/22 01:34:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.331 2012/02/04 13:21:56 jlec Exp $
+
+  04 Feb 2012; Justin Lecher <jlec@gentoo.org> totem-3.2.1.ebuild,
+  metadata.xml:
+  Enable support for zeitgeist plugin
 
   22 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   totem-2.32.0-r2.ebuild, totem-3.2.1.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 109f8a22ef87..a254117611a1 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX totem-2.30.2-mp2t-support.patch 522 RMD160 098ad431572647b1f84fa53d79e599dd68db479f SHA1 c1f437b3dd864589b2a8d45aa5b58087ad164edb SHA256 fd75446210f92e4abfb0d80018f1e5aad7fc0d4ad586c222b9984e0207dde963
 AUX totem-2.32.0-smclient-target-detection.patch 1546 RMD160 d26dad41d63e3ce2c819fa0be5844b2797d7fdbd SHA1 103b3182229b54e5b11ab6e941af110ee2761483 SHA256 c2c454e1a1776cc7c07ba4ee069105f6010e92478e9598af23956fac0fb13e63
 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
 EBUILD totem-2.32.0-r2.ebuild 5926 RMD160 9943f3238018a66691f177d860b33a3ce412f00b SHA1 6a292e39e7ffe577e3ab1e47b3b72e5c52208fe7 SHA256 d6455c769d0ced73796a298227fe5e1d431c7beed49fc8818b7fa6beb52bdd09
-EBUILD totem-3.2.1.ebuild 5053 RMD160 7f18685ef985218c1e8224e52c75efc35f0e2621 SHA1 ccfef2b34d7505a75299d0653ea1cded3ded67b2 SHA256 9d5c0ddd8fecbf728a68a5442005b618727ec86d60bf4bde1cd1c7f379ae049f
-MISC ChangeLog 49210 RMD160 01a3c6dc7b5dc724e55761025812b9fa383f58d4 SHA1 aa456327f6ec676d07e4e485ab2563f2979fd8f0 SHA256 3b56bbb53d4b0baf519919859c951cdad05c7f4e1f49eb2be997f6cd33e3fbb3
-MISC metadata.xml 1677 RMD160 59d7896204f7ec816dfb328963ee5b778183444a SHA1 83e27c979fe6052f731f0fcb279cdf1079f01a9d SHA256 1d1ade7ca3b0fca0d74ae45fa77521ac58481bac8cba3345d662ecc80fd2c3d1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk8bZ6AACgkQdjK8w9WeBnC+XwD/cDgY7kucU708covqAwbg83Xl
-L9RMbIQ8IF+RGIl0hssA/26kUlQM3H1PzJFzu8HUR4S+ZOyvtdCLcLmj+3NxYYri
-=4NHE
------END PGP SIGNATURE-----
+EBUILD totem-3.2.1.ebuild 5117 RMD160 f2c48c14a00e9fdf7b45c08c4f3a09ed93b9013e SHA1 cb13d4e947e70db10980d4a5866c5f1d6d298071 SHA256 d8cc19b526833597be7ab3497d78c5877e63c4cffeae7704d0e101de7fd721f3
+MISC ChangeLog 49327 RMD160 08775cbca441f95661b8a826ec243b4cfede9713 SHA1 51495cdf46d99394fa6d4142f4eaaef79a15affb SHA256 66cafeea5dfd3754803637736cccb74abee77a695b8a2b388c7c369e7ee0cc27
+MISC metadata.xml 1797 RMD160 51f30a3f7a7582cf1327e5a46b42934867a0f832 SHA1 a7600ddd8e7609c11e6e0012b891af9dc35a2aa5 SHA256 04a19965c26788a1d4240c61d0c65380040dead72790e07abfae4f2f107bcead
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 796969998082..ef92ef5daeff 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>video</herd>
-<herd>gstreamer</herd>
-<longdescription>
+	<herd>gnome</herd>
+	<herd>video</herd>
+	<herd>gstreamer</herd>
+	<longdescription>
 Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
 </longdescription>
-<use>
-	<flag name="bluetooth">Enable support for user-presence detection via the
+	<use>
+		<flag name="bluetooth">Enable support for user-presence detection via the
 		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
+		<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="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
+		<flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
 		from various sources</flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+		<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
+		<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>
-	<flag name="nautilus">Enable the nautilus extension</flag>
-	<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
-	<flag name="tracker">Enable support for searching media files using the
+		<flag name="nautilus">Enable the nautilus extension</flag>
+		<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
+		<flag name="tracker">Enable support for searching media files using the
 		indexer <pkg>app-misc/tracker</pkg></flag>
-	<flag name="upnp">Enable DLNA support through
+		<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>
+		<flag name="youtube">Enable youtube plugin</flag>
+		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+		<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/media-video/totem/totem-3.2.1.ebuild b/media-video/totem/totem-3.2.1.ebuild
index 0921b3eb5f8e..9f9f15000159 100644
--- a/media-video/totem/totem-3.2.1.ebuild
+++ b/media-video/totem/totem-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.3 2012/01/22 01:34:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.1.ebuild,v 1.4 2012/02/04 13:21:56 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -18,14 +18,13 @@ 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" # zeroconf
+IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala zeitgeist" # 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
@@ -79,7 +78,8 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
 		>=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] )"
+		>=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
 
@@ -99,6 +99,7 @@ DEPEND="${RDEPEND}
 
 # see bug #359379
 REQUIRED_USE="python? ( introspection )"
+REQUIRED_USE="zeitgeist? ( vala )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -131,6 +132,7 @@ pkg_setup() {
 	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"