Enable support for zeitgeist plugin, #401755

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

4 files changed, 19 insertions, 15 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 585c80c15f27..1af293e48971 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.334 2012/01/15 05:41:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.335 2012/02/04 10:44:01 jlec Exp $
+
+  04 Feb 2012; Justin Lecher <jlec@gentoo.org> gedit-3.2.6.ebuild,
+  metadata.xml:
+  Enable support for zeitgeist plugin, #401755
 
 *gedit-3.2.6 (15 Jan 2012)
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 521ebadc4943..7eb0b55d8c0d 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gedit-2.30.2-tests-skip.patch 1402 RMD160 ba1984f9207a57254be2f6904789f8403fc619c5 SHA1 42424dbb1472d55d3b2ba0a383154bd4c2935955 SHA256 faf11f3817052dd76aa9d34af938c4cd8136a71b7b7f4dc5a42e38abd90402e9
 DIST gedit-2.30.4.tar.bz2 4705692 RMD160 b2659b8847ef02c66a70acd2f4a492555e1e4d21 SHA1 ff7f4088d0b89224b84406557a7d9970323fdcc3 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c
@@ -7,13 +7,13 @@ DIST gedit-3.2.5.tar.xz 2895420 RMD160 4521dcd81ac8141d30cf7f2ce835330cb91484f6
 DIST gedit-3.2.6.tar.xz 2887264 RMD160 54f9ba105480371d4eb568d8ba43d1a3bc061a36 SHA1 15bca4c0754be9e5c251347ce2bfb1edf2b9dd5f SHA256 92b5c44203dbc222c79cb35ba43d32de115e2ef89b7bb80451239d0c3fa02f7f
 EBUILD gedit-2.30.4.ebuild 2162 RMD160 a8755808fa4a89d05b4135928c0cb0a2fbba3134 SHA1 df5f15ad6377cae2c8f3d510ffa27661098296be SHA256 7cca178576a8dd373e1be89fc8c0ced344106069722e7b812fd41bd348a2c367
 EBUILD gedit-3.2.5.ebuild 2801 RMD160 ec8e0a7b0d9319192e8d47175b3618aae30dab38 SHA1 a4c9cd1792a627ff202862276e206739f80ad55f SHA256 48bda5d81accce4d4d838953aa89a02fd3279dad56f2dd022ed91226ca0030bd
-EBUILD gedit-3.2.6.ebuild 2801 RMD160 538357d1127200a4f2d297471a6e56d87ff762e8 SHA1 abded7dbf691369698be357e39252fa16978e13e SHA256 e74451d91decdc2ae5f7624b1a7ac82abd2c148896fcb1ec182077b4003bf973
-MISC ChangeLog 42120 RMD160 547fced19f2cfe826c11944f5504243663f95380 SHA1 893795ef44f0c7e96cc98ca82700a2f39253e2f5 SHA256 c2d82973bb67ac5987d396a315ee502679ab0161d35f1a3c776b859485d81626
-MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+EBUILD gedit-3.2.6.ebuild 2780 RMD160 0f3e6b7dcad963179d31616ddcc0def0c97b0455 SHA1 2301c6d9826b9f3c4c3212e002c46418eb59eeea SHA256 947890da37ad609ef7baf817f1668bfce6c4f46803616e9ebb596e51c6374a9d
+MISC ChangeLog 42246 RMD160 161b5b7f22fdce55b2fe382f54383a96b7ca40e2 SHA1 f13aa4f653f314bc83b11f3a0b458b579450f327 SHA256 20730c8c95c0c2a4a0a42fd6de1b675263773e67844fd19db7707ee990f8b7e1
+MISC metadata.xml 379 RMD160 9a7dbcc663e731b38a6f7583657eaa7d347a1e4d SHA1 db520429f05eecce84bc28c8afb458edec06d569 SHA256 fed8959702c79b50a96b2f35e500772f85cfd950bac7f1c6435121995140dc48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8SZvEACgkQdjK8w9WeBnBrqgD/adPFrl48GUdu3yGHHzAwMZe6
-lCBzrgEOBualhYRz+mIA/3xC4urK/YT8g7OhtLN0+TFnSFaCpzuE2pluYEkITJnA
-=4xtT
+iEYEAREKAAYFAk8tDAwACgkQgAnW8HDreRYUpgCgzdp+vBV7AOUEqa06PKMy54iT
+7h0AnjGEggfGizPxvjgvgukE5VW/S8bt
+=5HMJ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-3.2.6.ebuild b/app-editors/gedit/gedit-3.2.6.ebuild
index c7c60e121492..900340772eba 100644
--- a/app-editors/gedit/gedit-3.2.6.ebuild
+++ b/app-editors/gedit/gedit-3.2.6.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/app-editors/gedit/gedit-3.2.6.ebuild,v 1.1 2012/01/15 05:41:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.2.6.ebuild,v 1.2 2012/02/04 10:44:01 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +introspection +python spell"
+IUSE="doc +introspection +python spell zeitgeist"
 KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
@@ -44,8 +44,8 @@ COMMON_DEPEND="
 		>=dev-python/pygobject-3.0.0:3[cairo] )
 	spell? (
 		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35
-	)"
+		>=app-text/iso-codes-0.35 )
+	zeitgeist? ( dev-libs/libzeitgeist )"
 
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic"
@@ -62,9 +62,7 @@ DEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	# TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?)
 	G2CONF="${G2CONF}
-		--disable-zeitgeist
 		--disable-deprecations
 		--disable-schemas-compile
 		--disable-scrollkeeper
@@ -72,7 +70,8 @@ pkg_setup() {
 		--enable-gvfs-metadata
 		$(use_enable introspection)
 		$(use_enable python)
-		$(use_enable spell)"
+		$(use_enable spell)
+		$(use_enable zeitgeist)"
 
 	python_set_active_version 2
 	python_pkg_setup
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index 44825d13c084..acd4e48c611b 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/metadata.xml
@@ -5,5 +5,6 @@
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
+		<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
 	</use>
 </pkgmetadata>