Version bump with significant UI changes. Drop old.

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

4 files changed, 62 insertions, 14 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 1c3a43a6f5de..8371af368e3d 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.154 2012/05/03 20:36:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.155 2012/05/13 18:18:52 tetromino Exp $
+
+*seahorse-3.4.1 (13 May 2012)
+
+  13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -seahorse-3.2.1.ebuild, +seahorse-3.4.1.ebuild,
+  +files/seahorse-3.4.1-g_clear_object.patch:
+  Version bump with significant UI changes. Drop old.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> seahorse-3.2.2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 3deeca86999c..c6c8406887ca 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX seahorse-2.32.0-libnotify-0.7.patch 729 RMD160 46b862933cc62e76dea72a397179bb8f48162de5 SHA1 400153b2f277ef753320adeeb992cf7586c67c0e SHA256 8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467
+AUX seahorse-3.4.1-g_clear_object.patch 796 RMD160 03682cbb817d8b0c700bd8901a55c4f01390ad3a SHA1 ee16108806c8d35ec636426dcf5bf14f76d2ea2a SHA256 18c946f35a465a4713d617bbb8d8987565dc8fb6e8a9ec7902ab9276dce7305f
 DIST seahorse-2.32.0.tar.bz2 2491230 RMD160 5599cf02321be038d8aa5bc96174e2cf05c62945 SHA1 1469884b67483c876cfe5b986a76495739927a99 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d
-DIST seahorse-3.2.1.tar.xz 1963480 RMD160 2f48c7201abda484f21f84ea6d5715965bc18418 SHA1 e6819828bb2783566a91549cb5aab5286123965e SHA256 84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2
 DIST seahorse-3.2.2.tar.xz 1964064 RMD160 64f42c3c200c3dc83100cb8c63489a0814e0fec8 SHA1 08a231cbb1aac4103465dee45fd18583d44785ea SHA256 25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9
+DIST seahorse-3.4.1.tar.xz 1999472 RMD160 3b1139e101b90e015663895160f089314d3ffdbb SHA1 877ad155b469c70dbe97982cba2fb0eb2d872924 SHA256 841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa
 EBUILD seahorse-2.32.0.ebuild 2162 RMD160 252320062575e6acc3dadcfacd80fdb242ea16d6 SHA1 53eb5da23cb7a0249bd0239a8d0e70a168fb3464 SHA256 badf51a1c01e93ba577a0458f68d3724a2b313a44bba565b6b1696a20b11dfe5
-EBUILD seahorse-3.2.1.ebuild 1641 RMD160 484ac7adc8ebd083c8782c14454eab001087810e SHA1 4347b9b24aa70b0cb627d85e5caad4eb36aca53e SHA256 3bb0ed7d26796d69c7e3ab97b07a1935e6685b20faca88b29c6b84c968a2942f
 EBUILD seahorse-3.2.2.ebuild 1641 RMD160 5ee97c1a9972555540677e31c9f9e403e90d35c8 SHA1 da4adc93ef25da70861628cd54e0abcd7cfad7d4 SHA256 e415933c07ed800ba9bfc2b4a143a60d0e7444b660b50e0d809e7bdeed333a0f
-MISC ChangeLog 22310 RMD160 6a689329fe19280fac95b5e911fcdff0107c0dff SHA1 b2818cf214e6564bc0d8a655ce394da27c751353 SHA256 ef0705c34b15841b1e9c760a95f98dc7ef228a99967b912620fc0a6af73568e5
+EBUILD seahorse-3.4.1.ebuild 1647 RMD160 3a0f4e52b26b3a4701183ae228808ee6f79557a7 SHA1 04ae4d28dceb0a86449ff956201321bd00af4797 SHA256 9ec96e75b8ac2b624534be91616942d4af6d1b674843807b2a942282734c6426
+MISC ChangeLog 22554 RMD160 819dd11c1e33ae5cc2ea1d6caa8f1d9a1d62b446 SHA1 948cf503e4bc2912f36ae9225aa3ead95c15b2a0 SHA256 7f156090aa4596d255c709d5e6bdc2a2d889390bd6c8903ddc44931c5d75eb88
 MISC metadata.xml 880 RMD160 c2fb2252ba2952f117e79ee62804d9cab52e4d31 SHA1 5de53e7b87d57d12d56b8b142eafa5fd22e79977 SHA256 8e007848eb55d49181d2e31de6fa2db55ebbf2d8bd5da3274dc7ecdae1d9367c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPr/sRAAoJEJ0WA1zPCt1hTFsH/iYQMlkNUH+0M4hGxfY5lZXh
+occsogFDv6uomBTEV7I8qbZaxLaXjYGc3Ia549HB3+7TL/8TyJBWwtqTRrMISRAP
+J+jTQwZomm8BTvPbuEeuAuGg11A3vtDarLRDrEiZHrSY3uUjlPksmqokYdxt+Ma5
+HjQVhDX7Av7EmD+zO/m0wwedbOACQUYMYun42N8VR/Lc7H4P7w8cvIGaCsFhFBSc
+qNsneXOEZaVRKWD63vpjf3Lcex9Y/cm4MQku13piTcORud9SHVWdj0hg+EQglKpM
+9t6RgzRHUDxfGXajzkr+gBOe/IBKJeDBmFF86UFOCEPwUuagTsfRptqq3VUA/9w=
+=4K6y
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/seahorse-3.4.1-g_clear_object.patch b/app-crypt/seahorse/files/seahorse-3.4.1-g_clear_object.patch
new file mode 100644
index 000000000000..1ae6915b2ed2
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-3.4.1-g_clear_object.patch
@@ -0,0 +1,25 @@
+From 5286af2304b3a59a2deeb508433c13d96fe2287c Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@gnome.org>
+Date: Mon, 30 Apr 2012 20:29:42 +0200
+Subject: [PATCH] Fix typo in finalizing of GPGME keyring
+
+---
+ pgp/seahorse-gpgme-keyring.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pgp/seahorse-gpgme-keyring.c b/pgp/seahorse-gpgme-keyring.c
+index 79ff39b..579ab09 100644
+--- a/pgp/seahorse-gpgme-keyring.c
++++ b/pgp/seahorse-gpgme-keyring.c
+@@ -859,7 +859,7 @@ seahorse_gpgme_keyring_finalize (GObject *object)
+ {
+ 	SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object);
+ 
+-	g_clear_object (self->pv->actions);
++	g_clear_object (&self->pv->actions);
+ 	g_hash_table_destroy (self->pv->keys);
+ 
+ 	/* All monitoring and scheduling should be done */
+-- 
+1.7.8.6
+
diff --git a/app-crypt/seahorse/seahorse-3.2.1.ebuild b/app-crypt/seahorse/seahorse-3.4.1.ebuild
index 5b8706fb660e..2feb3d1381f0 100644
--- a/app-crypt/seahorse/seahorse-3.2.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.4.1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.1.ebuild,v 1.2 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.4.1.ebuild,v 1.1 2012/05/13 18:18:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi debug doc ldap test"
+IUSE="avahi debug ldap"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
+	>=app-crypt/gcr-3.3.4
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-2.90.0:3
 	>=gnome-base/gnome-keyring-3.1.5
@@ -36,9 +37,8 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=app-text/gnome-doc-utils-0.3.2
 	>=app-text/scrollkeeper-0.3
-	virtual/pkgconfig
 	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.9 )
+	virtual/pkgconfig
 "
 # Need seahorse-plugins git snapshot
 RDEPEND="${COMMON_DEPEND}
@@ -52,19 +52,20 @@ pkg_setup() {
 		--enable-pkcs11
 		--disable-static
 		--disable-scrollkeeper
-		--disable-update-mime-database
 		--enable-hkp
 		$(use_enable avahi sharing)
 		$(use_enable debug)
-		$(use_enable ldap)
-		$(use_enable test tests)"
+		$(use_enable ldap)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 }
 
 src_prepare() {
+	# in next release
+	epatch "${FILESDIR}/${P}-g_clear_object.patch"
+
 	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
-		-e 's/-Werror//' \
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
 		-i configure.ac configure || die "sed 1 failed"
 
 	gnome2_src_prepare