Versio bump (buildable with current vala)

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

6 files changed, 143 insertions, 19 deletions

diff --git a/dev-libs/granite/ChangeLog b/dev-libs/granite/ChangeLog
index 08140c95582b..037f16a6f58a 100644
--- a/dev-libs/granite/ChangeLog
+++ b/dev-libs/granite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/granite
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/granite/ChangeLog,v 1.9 2015/06/09 14:17:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/granite/ChangeLog,v 1.10 2015/06/26 17:03:00 pacho Exp $
+
+*granite-0.3.0 (26 Jun 2015)
+
+  26 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/granite-0.3.0-build-fix.patch, +files/granite-0.3.0-build-fix2.patch,
+  +files/granite-0.3.0-build-fix3.patch, +granite-0.3.0.ebuild:
+  Versio bump (buildable with current vala)
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 401486665842..7b1a583bb6d2 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,30 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX granite-0.3.0-build-fix.patch 906 SHA256 48af9141720ea203c27d99e9e87b369295da1454d1bb876c49dff270f3e25e24 SHA512 dbbc67a006153d122f6b48759e7077e2deca73ef0d33b70243764141ccda89f5998d99e39fe6a05a9f527f43989b9ad66b191e65772fa5027365a333bf53e558 WHIRLPOOL 6c2e06ff2ad6e541fd568911005c1c8d5de21126b51ccfd336c872ad678e670dcbf6d0afb543e0cab619ae2062f62d9c7946f80ec40b37009628e36c4662ddb2
+AUX granite-0.3.0-build-fix2.patch 521 SHA256 a6821317eac03cf85956d6d88f94179e91c28c0f10f0bfd89200e74d5c83cb46 SHA512 7e9e7c39f63e845275b998f437648ea4c38c1043140b02b6474c215ba7ef78b258f9aabe1c83c5533d37c0dc8f502a1425a573578238f786c9903764644d4f19 WHIRLPOOL bb12c64dbb3b05c307e94942bb3e49012f25aaa01e23130a3f313af975127b05e5cff1f3f35385aa52968d6b976f7c2916334a2138a5145ec876891cba6bfe59
+AUX granite-0.3.0-build-fix3.patch 916 SHA256 607ca648cbd5afe799784f0be6587905b69fd095b732cd421d6d576c9630b69a SHA512 61e49768fbe13a88dfbbd5bbd5c481320fd90af65900d359d680502364795f0eb3cc94fc116dc0e720b94e994705a183d77c9e1243415ffcae6629b2b29937bc WHIRLPOOL 11843a9bb8d8cefdc80eb993bb0aaaa48c738b97a3424b578d193b587b4ea08613771e5e731325af32af1cf842dcb33cdeef2b4e64068946e63585e331a4de13
 DIST granite-0.1.0.tar.gz 92385 SHA256 8eb552f6fd086779b44d08a7a5283928801e6b0db8c54144b9286f9c89ca02f6 SHA512 06733870c2ea9d16e4bdb8aec9984b81d27de9aa8958d8b213fe31aad36675a8dadda9513271d63473e7d243e7b760aaa75ed6ad745f9214b394f23425f41f90 WHIRLPOOL 38cbddf7ef1c80bd907db512d43be68f920debc830fea853b1b793754f47182266d39b4a3c9da7aeecde3992dd1225cc7e2a25f775091184fd21f130346fd605
 DIST granite-0.2.1.tar.gz 146871 SHA256 4e9a97488c04b2c3eadcb4b8251c8938a9637820b1989449e55490f42a2ac92c SHA512 a9cbe43e836c1e5430260bb8643b63b6712c17a60c184ed7105a9e96eb68e8107c09de655f58262a1dcab85cfb59beb18352b49a5ddb0817f9aff7b86d1e2bb1 WHIRLPOOL 6d909976300fa32c16b127b0865f7c8b064230407c496653627aa63b1d24ff4197fa3894d93f9ea9d349a85c26ad0b94e7836bfe6fa15aa0deafa1e5b28d51df
 DIST granite-0.2.3.1.tgz 152607 SHA256 56f05338bb7967f0b912d35bf780a3ddd68b517e1939371a14a5f79581a8f80d SHA512 c4db7d3a9e65178fa961761355fdf4d3795513a5a8d0ba5a448761336817a0de027382421a86213b434449f257f3c869b6275357acb732b6dd382cf5ea86eca8 WHIRLPOOL b7287c7f5ab0c1213b8ea3dc8512375c133244a3d838e612d42c59d3c9694164c03a40a464e210a3b5771399afff0b24f2b054e61fb76fd636443f7804833caa
+DIST granite-0.3.0.tar.gz 285072 SHA256 df950dd79749213971d50316c68edadf1fb3c2151cb7d63f6a6b9edf12084ad1 SHA512 3ebbb7453b770f8b5b98cee0f96db8443d7583af0117b2d34c9daa82bf36d25418e0fcf61118e7551ced91e751d8b032998dc9cca2569e61c7227666c4383872 WHIRLPOOL ebf2130fc97b3d896b868ef2fb37ea3952b0e2630b872a05930ee52f8bc9fb656382cceb7cdbf201e91267b99ab6485777ea2880305ad9e32c79f4af7865f875
 EBUILD granite-0.1.0.ebuild 957 SHA256 fa8e64ce51ad803cc5c225613664c1aa5e9bf75aed673599dcbbdfd6e6da1dbd SHA512 c1ee75e00491da48efc4990bf316d74c0e80ab7fc48da4cee5c2485ebdd1b378b88d141909c98f106d66e7ad75124da874312ccad253a67f2af40d75ae55325a WHIRLPOOL ae51bf1a3e5774fe8e5bf43dd3942aca488ba9332d91b88b7b825517e0bc89657924d3529d7471833b595f5620a0c387f7e6ba6f00fbbc5477d0fea09599f36b
 EBUILD granite-0.2.1.ebuild 1241 SHA256 e20d82124054d6ea1479df931e932c5c42f192375a58a9478952e35e0bc596d4 SHA512 cdb0a1f4848b5d032ddc9729e4e5752db5518e68ec8a0d35c77115cc6c55fdd5522aac522a950e0603cf2d82fd9a5a7b6bc49383937aa0bd9e71fb8b468c2d62 WHIRLPOOL f45e42e6156e52529049781ee44a5270e8e3e1f380721d0e00b4884c84d58bfa1f80b4107dff806accd1c251a3f33615ca2db6cf2702102cc0140e848ee17ce0
 EBUILD granite-0.2.3.1.ebuild 1220 SHA256 ccbdf2cdbc31a2edf22b72ca556f37d28da39d5f1358a9a3cbcac4e1f4fee0d5 SHA512 df87d3215a83582ef0d6a0c9e129062faadeefa53ee0295bbff698e3680bc0695aaadf59b186be9acb8ba1837037fe7f088d2ad8bfb5e2aba66cc771a998919a WHIRLPOOL 9304f00609ca8d9893b72e284459770e47fda97eabfa9bb601b7ba8c7ee70c0d5b868082f2c31cb6d380be70ba2fceef308a173609f1307bbeb311b907671bf4
-MISC ChangeLog 1170 SHA256 616208cfac7b8bf3147edd0f52ed4091925d25185b5541b009b2250aacb0866c SHA512 2e8125660d4a7041d14e215612cb23bbaf6b30823edec947dedd3416df55ab3d545d74d878ef5b44df7fe629f11343998593f3dd9d1a3f9ff9d3a9e00a36ccf4 WHIRLPOOL 0b553a126aa933ed18e741cf160c3b2b1abccf46204346ac8892d7829639f9e22a0d6b73df53fb35acf7b2075557ea86b38b9d766caba2cdb9d4cf0453869810
+EBUILD granite-0.3.0.ebuild 1365 SHA256 650169d655fc8baddba7d92a0c20d17bd86a62cd369c841f34e8c55e344f32a8 SHA512 1a468ad5afbb4f776e81a747d4d5eca50bebb6ef1512d32b826135cdc532e139852dcc0d3599c194250eb81de83d257f6e6efdec469b98cc000b3736b8b8443c WHIRLPOOL 6509a487dc35693126a31cc7ead3abaaa05bd7fd29a0b05b92c035a23bbbaf344dc5f3afc693b4ed9b99d5c4558c5bc30d8c2011d1f8e4ea3bc85ff21a5bf247
+MISC ChangeLog 1436 SHA256 8b9f60d3eabfd5b94f55e5a45591764477e636bfa05db8d0b449c8d246f4b29e SHA512 8cf523fe20b473b48cf5b63c760b9a2eae76fb69c102cc1d4906c772715c91fe64e35ae4baf6ecc7879a54b894c7e567a85edd90d94eea7bc977dad388cf4387 WHIRLPOOL 273bbe2754ef0811ae026aba11ed3a371a0175647497ef99f8404635884b2c40634fc33fc76fb64c9ab29879286d99ef87e3acba235c3d9ad8a6fa61474cd7d7
 MISC metadata.xml 312 SHA256 42361111d48c2f497ea11885ec9606937b92c76c54d9662d4ed9897fa4dcd71e SHA512 774a6ba538b703eba8c61f22026e96d77b6a91e5255ad25daab8dd7b0c67370ba5330f4eddfee380f119076f6f68d46dd63f13c8f90e102db5fe7137786b1e89 WHIRLPOOL 25fefe65d5e0a7402748d789d3e87ace30e73b3cd56e89f2986950a84bce4a507dda3e80241ffb4c54fe08f6e24a8537fd408953a087ee1c07908942116a07d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdvVkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTgMQAKCqpuSqg+6ig9A0jjKobxnD
-cjnsU1heFM8Zg7lvqndvJqinjvH/S2pt0wPh3muT9kuvMuweay/VX0bIaJRGLT5K
-RjZQ22eO/h9n2fFTe06igRaYC7cwZAjsKs+x6zzmkJAMZNRGvL6Toy/XIy4pyVCS
-+3Wlrp0gUchQvCt7ZcPsrIdpbXeOcEbUD5sJOWW0IhqCroAWrBi9FOOWbrsvzlFF
-ZNx7XxMtYNd12UJ7UjslKFltEoOYlWVRAnACFPCBxHRwY9wvReEpSa+6t9jia/7U
-Thh+fwcjpzPULXWQTPuFRY7v+Udl5quEgtzAg3wH9362tZJJI1NDnAymvuXZs1y7
-XToeVG+BIQuq3plDMQQz7dqd4iLhBEF2U0vUEwFbGpt+GnmGSKcfHMvMeBM3fMr7
-jjG/WPmOBQI0jnC9qZWshVEt5paJHUw85RVadIMJlsQfQhISx1Sdyh0z6DdxneAK
-Xn4XtLKuGvwgCh2XXJOLqZLKWkWKgBIYIuRw7Z2kJrOtk/nKVsuqZI2enwzqZgI/
-JJPVa8fFY1FchwRskA1OrkVyL3mIGpHWbu71F+zRT4xuqpC+e9us/RNO2liYxn36
-LDsG8r/h2ANTiB4HYL6DGftO0PX/YtOnsVnsjJw5XvXfUc1x1uqYPTkS+MyWwgqV
-+uPaxaa7PokSCyIWXPqk
-=6jMP
+iEYEAREIAAYFAlWNhcUACgkQCaWpQKGI+9SIbgCdGiFnQ1ep7Bmkv+hrZub4aJ6k
+6A0An062RcqDbBahy252obNYw7HlvKMK
+=oLc8
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix.patch b/dev-libs/granite/files/granite-0.3.0-build-fix.patch
new file mode 100644
index 000000000000..f93a3c65df33
--- /dev/null
+++ b/dev-libs/granite/files/granite-0.3.0-build-fix.patch
@@ -0,0 +1,22 @@
+=== modified file 'lib/Widgets/ContractorView.vala'
+--- lib/Widgets/ContractorView.vala	2014-09-04 12:39:00 +0000
++++ lib/Widgets/ContractorView.vala	2015-03-23 05:21:46 +0000
+@@ -35,7 +35,7 @@
+     public delegate void ContractCallback ();
+     private Gee.HashMap<int, DelegateWrapper?> outsiders;
+     private int[] blacklisted_pos;
+-    private ListStore list;
++    private Gtk.ListStore list;
+ 
+     private struct DelegateWrapper { unowned ContractCallback method; }
+     
+@@ -73,7 +73,7 @@
+      */
+     public ContractorView (string filename, string mime, int icon_size = 32, bool show_contract_name = true) {
+         /* Setup the ListStore */
+-        list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
++        list = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
+         outsiders = new Gee.HashMap<int, DelegateWrapper?> ();
+         this.model = list;
+         
+
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix2.patch b/dev-libs/granite/files/granite-0.3.0-build-fix2.patch
new file mode 100644
index 000000000000..7c6bcb9236e5
--- /dev/null
+++ b/dev-libs/granite/files/granite-0.3.0-build-fix2.patch
@@ -0,0 +1,13 @@
+=== modified file 'lib/Widgets/DynamicNotebook.vala'
+--- lib/Widgets/DynamicNotebook.vala	2014-08-30 13:28:37 +0000
++++ lib/Widgets/DynamicNotebook.vala	2014-09-23 13:43:11 +0000
+@@ -941,7 +941,7 @@
+             notebook.create_window.connect (on_create_window);
+         }
+ 
+-        ~Notebook () {
++        ~DynamicNotebook () {
+             notebook.switch_page.disconnect (on_switch_page);
+             notebook.page_added.disconnect (on_page_added);
+             notebook.page_removed.disconnect (on_page_removed);
+
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix3.patch b/dev-libs/granite/files/granite-0.3.0-build-fix3.patch
new file mode 100644
index 000000000000..145d552c7a04
--- /dev/null
+++ b/dev-libs/granite/files/granite-0.3.0-build-fix3.patch
@@ -0,0 +1,24 @@
+=== modified file 'lib/Widgets/DynamicNotebook.vala'
+--- lib/Widgets/DynamicNotebook.vala	2014-07-31 12:41:52 +0000
++++ lib/Widgets/DynamicNotebook.vala	2014-08-30 13:28:37 +0000
+@@ -658,10 +658,19 @@
+        /**
+         * The text shown in the add button tooltip
+         */
++#if VALA_0_26
++        public string add_button_tooltip {
++            get { _add_button_tooltip = add_button.tooltip_text; return _add_button_tooltip; }
++            set { add_button.tooltip_text = value; }
++        }
++        // Use temporary field to avoid breaking API this can be dropped while preparing for 0.4
++        string _add_button_tooltip;
++#else
+         public string add_button_tooltip {
+             get { return add_button.tooltip_text; }
+             set { add_button.tooltip_text = value; }
+         }
++#endif
+ 
+         public Tab current {
+             get { return tabs.nth_data (notebook.get_current_page ()); }
+
diff --git a/dev-libs/granite/granite-0.3.0.ebuild b/dev-libs/granite/granite-0.3.0.ebuild
new file mode 100644
index 000000000000..d87780629fd4
--- /dev/null
+++ b/dev-libs/granite/granite-0.3.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/granite/granite-0.3.0.ebuild,v 1.1 2015/06/26 17:03:00 pacho Exp $
+
+EAPI=5
+VALA_MIN_API_VERSION="0.24"
+
+inherit cmake-utils gnome2-utils multilib vala versionator
+
+DESCRIPTION="A development library for elementary development"
+HOMEPAGE="http://launchpad.net/granite"
+SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/gobject-introspection:=
+	dev-libs/libgee:0.8[introspection]
+	>=x11-libs/gtk+-3.11.6:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS )
+PATCHES=(
+	# https://bugs.launchpad.net/granite/+bug/1453526
+	"${FILESDIR}"/${P}-build-fix{,2,3}.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	sed -i -e "/NAMES/s:valac:${VALAC}:" cmake/FindVala.cmake || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	HTML_DOCS=( doc/. )
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}