gnome-extra/activity-log-manager: Add backport fix for https://bugs.launchpad.net/activity-log-manager/+bug/1058037

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 129 insertions, 5 deletions

diff --git a/gnome-extra/activity-log-manager/ChangeLog b/gnome-extra/activity-log-manager/ChangeLog
index 6e1875169310..e74a3ac350da 100644
--- a/gnome-extra/activity-log-manager/ChangeLog
+++ b/gnome-extra/activity-log-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/activity-log-manager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/activity-log-manager/ChangeLog,v 1.10 2013/04/07 14:36:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/activity-log-manager/ChangeLog,v 1.11 2013/04/21 15:26:15 jlec Exp $
+
+*activity-log-manager-0.9.4-r1 (21 Apr 2013)
+
+  21 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  +activity-log-manager-0.9.4-r1.ebuild,
+  +files/activity-log-manager-0.9.4-muxer.patch, +files/config.vapi:
+  Add backport fix for
+  https://bugs.launchpad.net/activity-log-manager/+bug/1058037
 
   07 Apr 2013; Justin Lecher <jlec@gentoo.org>
   activity-log-manager-0.9.4.ebuild, metadata.xml:
diff --git a/gnome-extra/activity-log-manager/Manifest b/gnome-extra/activity-log-manager/Manifest
index f86dd22f24ab..ed5402b8c551 100644
--- a/gnome-extra/activity-log-manager/Manifest
+++ b/gnome-extra/activity-log-manager/Manifest
@@ -3,14 +3,17 @@ Hash: SHA512
 
 AUX activity-log-manager-0.9.0.1-gold.patch 414 SHA256 56092d56b86af2a7e6a99d7c96b5a6d446221c8a89600e160fce597ee9a6f21b SHA512 e83aecff6a7eae785f40094292433518141771b729ea236b44a58e82cb2e63721a4d0d9b17bc8816c612718342ad83b2b4336bff203d4308369a7504f488e266 WHIRLPOOL 8c754e5c0a20638e6e43b0a340fb39b0bab03ce030734439b177ea62f00f35ca0b9d3ba7bb1854397be21521a0131c0d3b79ae4e4968aec65b355f9c923c3638
 AUX activity-log-manager-0.9.1-ccpanel.patch 564 SHA256 b8921e1d4684b17e10e8a8355cacd76369817b09a3b774291c30aa038f66dea3 SHA512 c3565abb721cd2ef3d92b626f2963f8acef563479d8f298916d106d724cb3e029023cb703bf571c6b3387218bf15d5da3377be6ef26723f14602af0f1cbb2c02 WHIRLPOOL ebdfe2ad6a413af50c8e01f5d5568dfe82ab24d07cd5e03b6edc3c3ed353be81aac3dc61b6e005da0a45bed0e331756cbc4809651532781f6e73fa7a3a16f55b
+AUX activity-log-manager-0.9.4-muxer.patch 1140 SHA256 a3991ae49da3a03616956fa9640418f841e483452c927408c1ccc506aebbeda8 SHA512 f7a0a8f28f9a44eb092187fcfe222e7fb926dfd0c2c2ba485dbe59aef70c760bf1f7619bc96a48ec2291b6d389814c51f4d06936ecec6674b1d40c1b7681b94a WHIRLPOOL bcb751a5c70201ac838c104b2c649652755da861d467b57bb9c2e46fff42ada660fec3b2da08a9b7847fa811f2ec8697825099c001930cac03036e9223cf1d20
+AUX config.vapi 491 SHA256 a90902537bec20aa45dbe9fa1926cec355c3b97464bb9da6f2486e146a4f6ec8 SHA512 56a2b5be5a3ab621bd3a8417aa65b1d160d5ef55a322c1be2f7d7197b4b1e7d91e62e4b85e6499a9f644c8d5164bdad2c73867f04a7c62a2125919033afc5811 WHIRLPOOL 47cd369b2bb585ed4bdf0992e10401e8e00105ee5ba32288aca9dde273105cf22f01388dd9742b13ce372f0fa3e85ad263b01b023597a705637791dd0bf080ef
 DIST activity-log-manager-0.9.4.tar.gz 476219 SHA256 2ab6f0dd26526ede3e6b51477b9765a5be2cf263d51a9a34cf07bf9377612e86 SHA512 6bd08e20a233e7329b796aba77d72b09833f3e807ae85a4196cf6c3f0372fdcfa06c7e0eb5dac5b4f7245129c1166945c1d044b0d9a8f1f98bf33bbd12264589 WHIRLPOOL dbbaf6c7e9ff178ca37dd0f772a3dda83ce70d8eab15c7cb4629fc304f61e01d74ad7d682a1f3edd56c20b7d32c0b766a1f7071d767616b10164802879c88a6d
+EBUILD activity-log-manager-0.9.4-r1.ebuild 1303 SHA256 2576c606e18f1f510360c08aabd9531a4b8364ea45d7e6d8a18076da519f3543 SHA512 49868030b4d7ce5e86fb49f87b4dc4823a78b19ef2af58e3d72fb6dd5545b95286f1b4b61b17a738b53e08c3ea7fa2b4e895ccf9f4d85dca19b7ec24dd107020 WHIRLPOOL 7016ddb23247a0504bb2db1850ccf754bcdcb299130ce224c043b7146b7b2b96fdd5838ea38f189e09f3085d3fb61ac660b11863ee743c44727677342773eaf7
 EBUILD activity-log-manager-0.9.4.ebuild 1248 SHA256 c40e596ca8131ec2a39bca2a30e29da7044db25ad146f7350b576999c5db8dac SHA512 33197026a8645f4d39d59b2547b5fe06b49e80c06cc046d9665eaed4216b329607abbaa409b82eda44daee578edaa599db9b80965fe65f5b616932a5b28b6f70 WHIRLPOOL fdf7132ec656e489120782d8b97aed956495c373549832d7af9e9d4cb1ca26eed0da527ce8124a0f614b895274747a05836980e98d46493f491cdebbbdf1f5a9
-MISC ChangeLog 2104 SHA256 e9817b7f48cf55775e82ea46aa3c6dd86b7f2eb585e3f20a4d981c5638469fc1 SHA512 26dcb7af9bcd17692ba88745aafc5827779236415e42772278a87d10760890aaf399ebb980de13aa487c625603ced9676fc3759aa5c7c20dc8a676eee276fb2d WHIRLPOOL b8930c159f824a8f493f85821d481fd4aaa089e31a03e6bf4e9f08ad15585debb9bbf79134971682cb9e60b2cfe1672329133d47348ed0028dd07d29ca0ffe21
+MISC ChangeLog 2394 SHA256 c890e00abac594899d903aa2e92c1ecf15c39bc838895eccc5753da22f73ff5c SHA512 ada750fb623b8eb1fbfb1abfafdf36e3ca0f78372afdec731288c59554bbf436f512857b37e01cdbefbdac72ca487821b09b6fe394655fce6bf2548a41e7b41c WHIRLPOOL 7f13f16e6e35186c83c433c0e0bd7fb59fa1bc133187d49f34633395c9cd2135d6886b1e9eded7e951cf4e4f200e36377198b45745c5be2055b723b301ecc57a
 MISC metadata.xml 536 SHA256 83e913a62e3af0d613be2bf57b0fb68e5129ca1089f337a35df258f6f2c363b7 SHA512 357d8e57ebd56513bc0515f1d97585d92ab1eac7acf02ba2a5629175557729f0dccffa9770184625ad7fbe71facc847bc6a24d1419fde160e8b7a69207508e90 WHIRLPOOL 9d250d89a5ce8d334042e779e175fde795b40f5f5e73a82c1671104a058453d5ecb7a17273e65d733674edefda9198a095a5a22871a1a94952ac180b4041837e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFhhIEACgkQgAnW8HDreRYS5gCguHHBMSAcyjnS8z1ho87+G/dM
-/owAnjFJCmJyRIQ92z5tKYyZyfYgNm0Y
-=bjYl
+iEYEAREKAAYFAlF0BRgACgkQgAnW8HDreRbnCgCfSduG1ZAIcYFm1g1VFrRhJZpx
+UHYAni0uslhLxjZMFlnH6N6DOjLC4PYm
+=ns25
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.4-r1.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..58e0cdadebaa
--- /dev/null
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/activity-log-manager/activity-log-manager-0.9.4-r1.ebuild,v 1.1 2013/04/21 15:26:15 jlec Exp $
+
+EAPI=5
+
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.10"
+VALA_MAX_API_VERSION="0.18"
+
+inherit autotools eutils gnome2 vala versionator
+
+DESCRIPTION="GUI which lets you easily control what gets logged by Zeitgeist"
+HOMEPAGE="https://launchpad.net/activity-log-manager/"
+SRC_URI="http://launchpad.net/history-manager/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libzeitgeist
+	dev-libs/libgee:0
+	dev-libs/glib:2
+	gnome-extra/zeitgeist
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	${vala_depend}
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	DOCS="README NEWS INSTALL ChangeLog AUTHORS"
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.0.1-gold.patch \
+		"${FILESDIR}"/${PN}-0.9.1-ccpanel.patch \
+		"${FILESDIR}"/${P}-muxer.patch
+	cp "${FILESDIR}"/config.vapi src/ || die
+	sed \
+		-e "/^almdocdir/s:=.*$:= \${prefix}/share/doc/${PF}:g" \
+		-i Makefile.am || die
+	vala_src_prepare
+	eautoreconf
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.4-muxer.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.4-muxer.patch
new file mode 100644
index 000000000000..f489506361c0
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.4-muxer.patch
@@ -0,0 +1,52 @@
+--- activity-log-manager-0.9.4.orig/src/alm.vala 2012-03-01 21:25:48 +0000
++++ activity-log-manager-0.9.4/src/alm.vala 2013-04-19 13:57:45 -0700
+@@ -23,6 +23,23 @@ using Gtk;
+ 
+ 
+ namespace Alm {
++	public class App : Gtk.Application
++	{
++		public App()
++		{
++			Object(application_id: "org.zeitgeist.Alm", flags: ApplicationFlags.FLAGS_NONE);
++		}
++		public override void activate()
++		{
++			var window = new Main();
++			add_window(window);
++		}
++		public static void main(string[] args)
++		{
++			var app = new App();
++			app.run();
++		}
++	}
+ 	public class Main : Gtk.Window 
+ 	{
+ 		public Main ()
+@@ -31,23 +48,6 @@ namespace Alm {
+ 			var widget = new ActivityLogManager();
+ 			this.add(widget);
+ 			this.show_all();
+-			this.destroy.connect(on_destroy);
+-		}
+-		[CCode (instance_pos = -1)]
+-		public void on_destroy (Widget window) 
+-		{
+-			Gtk.main_quit();
+-		}
+-		static int main (string[] args) 
+-		{
+-			Gtk.init (ref args);
+-			var alm = new Gtk.Application ("org.zeitgeist.Alm", 
+-										ApplicationFlags.FLAGS_NONE);
+-			var window = new Main ();
+-			alm.add_window (window);
+-			
+-			Gtk.main ();
+-			return 0;
+ 		}
+ 	}
+ }
+
+
diff --git a/gnome-extra/activity-log-manager/files/config.vapi b/gnome-extra/activity-log-manager/files/config.vapi
new file mode 100644
index 000000000000..9cd4f3792917
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/config.vapi
@@ -0,0 +1,12 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config {
+        public const string GETTEXT_PACKAGE;
+        public const string SPRITE_DIR;
+        public const string BACKGROUND_DIR;
+        public const string PACKAGE_DATA_DIR;
+        public const string PACKAGE_LOCALE_DIR;
+        public const string PACKAGE_NAME;
+        public const string PACKAGE_VERSION;
+        public const string VERSION;
+        public const string GNOMELOCALEDIR;
+}