Bump to 0.14, and remove 0.13

(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key 560FDD64)

3 files changed, 8 insertions, 99 deletions

diff --git a/app-crypt/libsecret/ChangeLog b/app-crypt/libsecret/ChangeLog
index c9cbfb7362ce..4b051fc13884 100644
--- a/app-crypt/libsecret/ChangeLog
+++ b/app-crypt/libsecret/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/libsecret
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/ChangeLog,v 1.14 2013/03/02 08:51:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/ChangeLog,v 1.15 2013/03/05 01:26:14 nirbheek Exp $
+
+*libsecret-0.14 (05 Mar 2013)
+
+  05 Mar 2013; Nirbheek Chauhan <nirbheek@gentoo.org> +libsecret-0.14.ebuild,
+  -files/libsecret-0.13-fix-secretvalue-get.patch, -libsecret-0.13.ebuild:
+  Bump to 0.14, and remove 0.13
 
 *libsecret-0.13 (02 Mar 2013)
 
diff --git a/app-crypt/libsecret/files/libsecret-0.13-fix-secretvalue-get.patch b/app-crypt/libsecret/files/libsecret-0.13-fix-secretvalue-get.patch
deleted file mode 100644
index daa54600245d..000000000000
--- a/app-crypt/libsecret/files/libsecret-0.13-fix-secretvalue-get.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From ddd9bdd2e9fcc6009e54a17751d1002a039d180a Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Mon, 25 Feb 2013 13:56:32 +0100
-Subject: [PATCH] Fix introspection for secret_value_get() to return a uint8
-
-This works around a crash in pygobject.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=694448
----
- libsecret/secret-value.c         |  4 ++--
- libsecret/tests/test-unstable.py | 34 +++++++++++++++++++++++++++++++---
- 2 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/libsecret/secret-value.c b/libsecret/secret-value.c
-index 7bd7bc2..a6fc5b8 100644
---- a/libsecret/secret-value.c
-+++ b/libsecret/secret-value.c
-@@ -151,13 +151,13 @@ secret_value_new_full (gchar *secret,
- /**
-  * secret_value_get:
-  * @value: the value
-- * @length: (out): the length of the secret
-+ * @length: the length of the secret
-  *
-  * Get the secret data in the #SecretValue. The value is not necessarily
-  * null-terminated unless it was created with secret_value_new() or a
-  * null-terminated string was passed to secret_value_new_full().
-  *
-- * Returns: (array length=length): the secret data
-+ * Returns: (array length=length) (element-type guint8): the secret data
-  */
- const gchar *
- secret_value_get (SecretValue *value,
-diff --git a/libsecret/tests/test-unstable.py b/libsecret/tests/test-unstable.py
-index 7f611e7..2aa6d2b 100644
---- a/libsecret/tests/test-unstable.py
-+++ b/libsecret/tests/test-unstable.py
-@@ -14,22 +14,50 @@
- import unittest
- 
- from gi.repository import MockService as Mock
--from gi.repository import SecretUnstable as Secret, GLib
-+from gi.repository import SecretUnstable, Secret, GLib
-+
-+EXAMPLE_SCHEMA = Secret.Schema.new('org.mock.type.Store',
-+	Secret.SchemaFlags.NONE,
-+	{
-+		'number': Secret.SchemaAttributeType.INTEGER,
-+		'string': Secret.SchemaAttributeType.STRING,
-+		'even': Secret.SchemaAttributeType.BOOLEAN,
-+	}
-+)
-+
-+attributes = {
-+	'number': '8',
-+	'string': 'eight',
-+	'even': 'true'
-+}
- 
- class TestStore(unittest.TestCase):
- 	def setUp(self):
- 		Mock.start("mock-service-normal.py")
- 
- 	def tearDown(self):
--		Secret.Service.disconnect()
-+		SecretUnstable.Service.disconnect()
- 		Mock.stop()
- 
- 	def testSynchronous(self):
--		service = Secret.Service.get_sync(Secret.ServiceFlags.NONE, None);
-+		service = SecretUnstable.Service.get_sync(SecretUnstable.ServiceFlags.NONE, None);
- 		path = service.read_alias_dbus_path_sync("default", None);
- 
- 		# Just running this without error is good enough for us to test the unstable gir
- 		self.assertNotEqual(path, None);
- 
-+	def testValueGet(self):
-+		Secret.password_store_sync(EXAMPLE_SCHEMA, attributes, Secret.COLLECTION_DEFAULT,
-+		                           'the label', 'the password', None)
-+
-+		service = SecretUnstable.Service.get_sync(SecretUnstable.ServiceFlags.NONE, None)
-+		items = service.search_sync(EXAMPLE_SCHEMA, { 'even': 'true' },
-+		                                   SecretUnstable.SearchFlags.ALL | SecretUnstable.SearchFlags.LOAD_SECRETS,
-+		                                   None)
-+
-+		item = items[0]
-+		item_secret = item.get_secret()
-+		self.assertEqual(item_secret.get(), "the password")
-+
- if __name__ == '__main__':
- 		unittest.main()
--- 
-1.7.12.4
-
diff --git a/app-crypt/libsecret/libsecret-0.13.ebuild b/app-crypt/libsecret/libsecret-0.14.ebuild
index 3ffc19e8822c..73b195d2c368 100644
--- a/app-crypt/libsecret/libsecret-0.13.ebuild
+++ b/app-crypt/libsecret/libsecret-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.13.ebuild,v 1.1 2013/03/02 08:51:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.14.ebuild,v 1.1 2013/03/05 01:26:14 nirbheek Exp $
 
 EAPI="5"
 VALA_MIN_API_VERSION=0.18
@@ -64,9 +64,6 @@ src_prepare() {
 		-e '/test_get_async);/d' \
 		-i libsecret/tests/test-service.c || die
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=694448
-	epatch "${FILESDIR}/${P}-fix-secretvalue-get.patch"
-
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }