Add fixes for latest glib, Gtk and vala changes, bug #553348

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 219 insertions, 7 deletions

diff --git a/gnome-extra/activity-log-manager/ChangeLog b/gnome-extra/activity-log-manager/ChangeLog
index 678023e9694f..ab4fbf60321a 100644
--- a/gnome-extra/activity-log-manager/ChangeLog
+++ b/gnome-extra/activity-log-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/activity-log-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/activity-log-manager/ChangeLog,v 1.22 2015/06/27 11:31:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/activity-log-manager/ChangeLog,v 1.23 2015/06/28 17:01:15 jlec Exp $
+
+*activity-log-manager-0.9.7-r1 (28 Jun 2015)
+
+  28 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +activity-log-manager-0.9.7-r1.ebuild,
+  +files/activity-log-manager-0.9.7-ambiguous.patch:
+  Add fixes for latest glib, Gtk and vala changes, bug #553348
 
   27 Jun 2015; Pacho Ramos <pacho@gentoo.org> activity-log-manager-0.9.7.ebuild:
   Fix typo in VALA_MAX_API_VERSION variable, it also builds with 0.26 (even if
diff --git a/gnome-extra/activity-log-manager/Manifest b/gnome-extra/activity-log-manager/Manifest
index 7634c7ed8b2c..e07d409bdc2e 100644
--- a/gnome-extra/activity-log-manager/Manifest
+++ b/gnome-extra/activity-log-manager/Manifest
@@ -1,17 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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.7-ambiguous.patch 4383 SHA256 8560255631533ccd8500c71789f0ad6075d35225e98585e96f243bf186ab7635 SHA512 73d020b6cc76090fac8f9c06f9ad029d78b3e5ff6c246f25bbd13d4c29bc1e47b0c77ee20f09b77f89c9e842df103300287e149cdd3bf43cbfe17c506537936a WHIRLPOOL 42940fff1574fc7a16e1bf9656de716d78fc5bc01a4aadd31cd7ea66a788e08d2c488658794fbea32a7fc804fabbf790d1d09ee4b61e24efbf8f417132c12b0f
 AUX activity-log-manager-0.9.7-gtk-icon_size.patch 480 SHA256 e9f8fe64576662ca1905ea7682929a5e2dcb1665a623eb517fec7a4331416c4a SHA512 d4b3b4f21c6ee67f577b78236ca6308fcb1e20aed85a0b43d5946ab243f27180f52e96652bf3105bcb11692807eab7f2df4f83f5f15d154dd8f743612460aaeb WHIRLPOOL 4dee2178593621bed72f7972c3edb846f197b4cfa8c176ad7895a395219a1ad1b3e6153c88371356c78ef03edd9f4b784b136e2245b301f697423f6a0a150db3
 AUX config.vapi 491 SHA256 a90902537bec20aa45dbe9fa1926cec355c3b97464bb9da6f2486e146a4f6ec8 SHA512 56a2b5be5a3ab621bd3a8417aa65b1d160d5ef55a322c1be2f7d7197b4b1e7d91e62e4b85e6499a9f644c8d5164bdad2c73867f04a7c62a2125919033afc5811 WHIRLPOOL 47cd369b2bb585ed4bdf0992e10401e8e00105ee5ba32288aca9dde273105cf22f01388dd9742b13ce372f0fa3e85ad263b01b023597a705637791dd0bf080ef
 DIST activity-log-manager-0.9.7.tar.xz 332004 SHA256 53014a08056168171579c210a8e5cfd949a0efe3bd23f6d38cd0ce0b0168841f SHA512 e0a43cae08e7f86b35ab8a4b0c70a4eb4a2ae821d3ab907a5c4135640e67c572ec2e735a3350099e3febe177d67db83af526c62b7b595894c0df08d84c3bb6ce WHIRLPOOL 7d92d5cb0fbc1b3353dab4164115e9e93efb4859a055ce9b9fffe3a580c49534e0b6e61c321ea7f896b7f166551c57bd3fd06a2692694a1c36e7554b0a014352
+EBUILD activity-log-manager-0.9.7-r1.ebuild 1392 SHA256 a56042713c48709005e5d05b1059056fb65d148a4b36acfb8fc395377694a606 SHA512 733bb361fbb006032c8b69fd997d13d659ceb6359fec1bdc91abd0afa90b65306b393eb9235f3aa32c6f8e02ee282e505fcd54a2a7be682917ab69fc304f4b30 WHIRLPOOL 421a763aa59f475bce002799941ae51b92d9fecb808dbc5bf210fe88d926d727e432fc090036c8dc26c2d0b37207c37dcb8f8ad8c262725afbde9455b9f2fea2
 EBUILD activity-log-manager-0.9.7.ebuild 1348 SHA256 167d87e77b6220eca93d6f50cd426d461157e8289f50ec484690b3763c059ec6 SHA512 954fd53228b7a573f19c55168b3fb80e712c524e95b4e4c7a281b00c1f9041726776e9894db44b1805b47f9c95a7dd5606170d5be182579b34dcdeef33a11a33 WHIRLPOOL 564b8c3249c6be98726b45a8f9c471a6612a9120529dbb7984935231c2c49b018b38f8fee03f98498eeaef49108f6c9bc3af7cb0e7bf7659f3b9912516d59efb
-MISC ChangeLog 4208 SHA256 365e0bae4e985244d5341e3a43fda1d35b1f79e2f7f956c23c0d9efdaf86337a SHA512 4d384eed5a5f42c3348b28aea5baf461c214f7e40c71a8ae35acb4f820dfbc79d647ed967d82c5471635dd4b1ba3252a4e8a7964da2cded3de579d50477bdabb WHIRLPOOL 159f4656b3dff509bdd67cbb28f7cf0b79c4b52e01ad5583606019f83503e18d857f99075665e0405c685a93a2844e93267ee82d2e7b0a59ca776aeb2d4514fe
+MISC ChangeLog 4458 SHA256 85423f8b464d6b56389ba669b636dee6fd3a4ccfef2db6f468cb1edfa9ce0b27 SHA512 7947ddb475fcce1846673fb3422ad794ba2c25cf467ba0def34198edbd8b1aac31e9ce98ba929822fbcd5ff5b24d4379d6160fc57c39584a1b548833d73ccf47 WHIRLPOOL 7c0243b399d0dea65e937853d05289a4d2ab672001fab92ee46d3f1c74b7853b06dd887651e1af7ad91a809e73eb91ed25ebabfaa438bf12aff196c9d98a7ac9
 MISC metadata.xml 620 SHA256 272b016abbd535aaf6786569d8bbe328d3e875d999fbcc651ae0134ac4a71628 SHA512 f2578fa3f30dec392f1002ca45cee475fdeb3433f90ae7728616e8a677ba3df73794b836f3be8938e9b6fb662cd74160a5e961426aa5933f557a7446291c2e61 WHIRLPOOL 90d401464c31f71b67769bd82e917f56972ff9fa9fbbe0ffa91a07dabe176e199b3a812ed8cd296e0919519d5a9916f25db7ceccaec2ace3fb85a6cf87193019
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWOiZYACgkQCaWpQKGI+9QRDwCfavn3nQhNlveG2uzOkHqnE+Fj
-z3IAn0AWbk4Vzknle5Z6w4XDJZ0wQMTW
-=dFCM
+iQJ8BAEBCgBmBQJVkChhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNn0P/RJ4Apk0zoP+yXdCbT7aY0sN
+9REabRlBYvFADcwEln0y4XKL4CYs2cwtsYyICduB+eULLZKW7bxc2mBF8WzLWHPR
+L7booiTDV1MdzD0CoZJCR+XdWlC2hsw7dGizmZbSOiE8DVCqyoRilDZ6CDIDY4dm
+pVqGS2W7927v2AdeOz+GDtrciSNo2BOaOK4rKbsDqHa7K7lrsWG7PkTggO+YhRgD
+1SggD9pna5QO4MRFW3nYesFSlglBdhhu2AB88oIvs89a9CiB+jnm3ad+JIfFPayv
+V2EdqAkfiv21A+neSJCrWlq5LQb5fTEB+ShR3lJi1vFPY5NypQc1hNOQYE+2ILWP
+VmfYF+OSrBfIUZpwQT9t1U0VLLaOV/3N1DqsQ9DZoZWODceR2U5DxuAgRVjKx0jT
+73jnk/34H6/4uGO4vXx/qHWWdWMsKF2lCKWcYUGaD18F7oHup0DHTGMlPRbG3Lev
+losPlFLcPdDjyUpE0NBY+D8LcrydP73usTW+LfC9Pff8iS3uhfYxXlHOtT5TaXMw
+pAHqVjti/2FbUFq6BpOwjSb7Lqzrr1SAxPZ5WUYwZkw+6puGnA8W3Bm9L9ZWiBmH
+dNGcu5gfyY1bpASlEfJ0NysstqNDGTwL0It4znjyD5iHNuj4EIZqowqiAPWlQ+WU
+El2WfqwCho+FGdFELHpY
+=6VIv
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..2146f8757f56
--- /dev/null
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 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.7-r1.ebuild,v 1.1 2015/06/28 17:01:15 jlec Exp $
+
+EAPI=5
+
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.26" # Fails with 0.24, but works with 0.26 and older versions
+#VALA_MAX_API_VERSION="0.26" # build fails with vala-0.28
+WANT_AUTOMAKE=1.13
+
+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.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	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)
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	DOCS="README NEWS INSTALL ChangeLog AUTHORS"
+
+	rm src/${PN}.c || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.0.1-gold.patch \
+		"${FILESDIR}"/${P}-gtk-icon_size.patch \
+		"${FILESDIR}"/${P}-ambiguous.patch
+	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.7-ambiguous.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch
new file mode 100644
index 000000000000..ba582aef8978
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch
@@ -0,0 +1,139 @@
+ src/blacklist-dbus.vala               |  4 ++--
+ src/security-widget.vala              |  2 +-
+ src/unified-privacy-applications.vala | 16 ++++++++--------
+ src/unified-privacy.vala              |  4 ++--
+ 4 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/blacklist-dbus.vala b/src/blacklist-dbus.vala
+index 355a684..fd165e3 100644
+--- a/src/blacklist-dbus.vala
++++ b/src/blacklist-dbus.vala
+@@ -137,7 +137,7 @@ namespace Alm {
+ 			return false;
+ 		}
+ 
+-		public async void find_events (string id, TreeIter iter, ListStore store)
++		public async void find_events (string id, TreeIter iter, Gtk.ListStore store)
+ 		{
+ 	     	Event event = new Event();
+ 	    	event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
+@@ -165,7 +165,7 @@ namespace Alm {
+ 			store.set_value(iter, 5, counter);
+ 		}
+ 
+-		public void get_count_for_app (string app_id, TreeIter iter, ListStore store) {
++		public void get_count_for_app (string app_id, TreeIter iter, Gtk.ListStore store) {
+ 			find_events(app_id, iter, store);
+ 		}
+ 		
+diff --git a/src/security-widget.vala b/src/security-widget.vala
+index 4394924..e983c15 100644
+--- a/src/security-widget.vala
++++ b/src/security-widget.vala
+@@ -39,7 +39,7 @@ namespace Alm {
+ 
+ 		private void set_up_ui () {
+ 
+-			var liststore_delay = new ListStore (2, typeof (string), typeof (int));
++			var liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
+ 			TreeIter iter;
+ 			liststore_delay.append (out iter);
+ 			liststore_delay.set (iter, 0, "1 second", 1, 0);
+diff --git a/src/unified-privacy-applications.vala b/src/unified-privacy-applications.vala
+index 9b06f44..a4966d3 100644
+--- a/src/unified-privacy-applications.vala
++++ b/src/unified-privacy-applications.vala
+@@ -60,7 +60,7 @@ namespace Alm {
+ 			}
+ 		}
+ 
+-		public void get_count_for_app(string id, TreeIter iter, ListStore store) {
++		public void get_count_for_app(string id, TreeIter iter, Gtk.ListStore store) {
+ 			this.blacklist_interface.get_count_for_app(id, iter, store);
+ 		}
+ 
+@@ -131,7 +131,7 @@ namespace Alm {
+ 	private class ApplicationsTreeView : Gtk.Box {
+ 	
+ 		private ApplicationBlacklist app_blacklist;
+-		private ListStore store;
++		private Gtk.ListStore store;
+ 		private TreeView treeview;
+ 		
+ 		HashTable<string, AppChooseInfo> blocked_apps;
+@@ -145,7 +145,7 @@ namespace Alm {
+ 			N_COLS
+ 		}
+ 
+-		public ListStore liststore {
++		public Gtk.ListStore liststore {
+ 			get {
+ 				return this.store;
+ 			}
+@@ -160,7 +160,7 @@ namespace Alm {
+ 			this.blocked_apps = blocked;
+ 			this.unblocked_apps = unblocked;
+ 
+-			this.store = new ListStore (TreeViewCols.N_COLS,
++			this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+ 										typeof (string),
+ 										typeof (Gdk.Pixbuf),
+ 										typeof (string));
+@@ -292,7 +292,7 @@ namespace Alm {
+ 	private class AppSelectionTreeView : Gtk.Box {
+ 
+ 		private ApplicationBlacklist app_blacklist;
+-		private ListStore store;
++		private Gtk.ListStore store;
+ 		private TreeView treeview;
+ 		
+ 		enum TreeViewCols
+@@ -312,7 +312,7 @@ namespace Alm {
+ 			}
+ 		}
+ 
+-		public ListStore liststore {
++		public Gtk.ListStore liststore {
+ 			get {
+ 				return store;
+ 			}
+@@ -323,7 +323,7 @@ namespace Alm {
+ 			
+ 			this.app_blacklist = app_blacklist;
+ 			
+-			this.store = new ListStore (TreeViewCols.N_COLS,
++			this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+ 										typeof (string),
+ 										typeof (Gdk.Pixbuf),
+ 										typeof (string),
+@@ -426,7 +426,7 @@ namespace Alm {
+ 			}
+ 		}
+ 
+-		public ListStore liststore {
++		public Gtk.ListStore liststore {
+ 			get {
+ 				return treeview.liststore;
+ 			}
+diff --git a/src/unified-privacy.vala b/src/unified-privacy.vala
+index 0d46370..c64f78d 100644
+--- a/src/unified-privacy.vala
++++ b/src/unified-privacy.vala
+@@ -55,7 +55,7 @@ namespace Alm {
+ 		
+ 		//General stuffs
+ 		private TreeView exception_list;
+-		private ListStore exception_list_store;
++		private Gtk.ListStore exception_list_store;
+ 		
+ 		private Switch record_button;
+ 		
+@@ -262,7 +262,7 @@ namespace Alm {
+ 			exception_vbox.pack_start (al2, false, false, 5);
+ 
+ 			// Exception TreeView
+-			this.exception_list_store = new ListStore (4, 
++			this.exception_list_store = new Gtk.ListStore (4, 
+ 				typeof(string),      // Full file path of application desktop file.
+ 				typeof(Gdk.Pixbuf?), // Pixbuf
+ 				typeof(string),      // File basename or ApplicationName