Bump, drop old. Notable changes: gpg key loading improvements.

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

3 files changed, 20 insertions, 33 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 9b440fbcaf11..fc7fb49f14ac 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.151 2011/10/30 07:39:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.152 2011/11/17 06:11:08 tetromino Exp $
+
+*seahorse-3.2.2 (17 Nov 2011)
+
+  17 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -seahorse-3.0.2.ebuild, +seahorse-3.2.2.ebuild:
+  Bump, drop old. Notable changes: gpg key loading improvements.
 
 *seahorse-3.2.1 (30 Oct 2011)
 
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 465705a3d967..59c235bab052 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX seahorse-2.32.0-libnotify-0.7.patch 729 RMD160 46b862933cc62e76dea72a397179bb8f48162de5 SHA1 400153b2f277ef753320adeeb992cf7586c67c0e SHA256 8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467
 DIST seahorse-2.32.0.tar.bz2 2491230 RMD160 5599cf02321be038d8aa5bc96174e2cf05c62945 SHA1 1469884b67483c876cfe5b986a76495739927a99 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d
-DIST seahorse-3.0.2.tar.bz2 2545909 RMD160 6a1fd6b00b8bce407ebf4add8e6361fb9fe3ea2e SHA1 420793a1f17af5fa982f15050bf5ea2656471fba SHA256 78b38d6e7220d1957af34eac79c21423f1f4be066853126d30cc030d8407a1bf
 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
 EBUILD seahorse-2.32.0.ebuild 2170 RMD160 52ab7bcbfaac03005201ef46f2c13d326cb28962 SHA1 0f215040cc6d70003583bbce3479de3a009ebb23 SHA256 200fd329f20ab38dd3157d57134592e01d6bd492d55e8d286574bbf9bb2f2340
-EBUILD seahorse-3.0.2.ebuild 2281 RMD160 dcb0ba61a6bec427a1c28743a006a7489b1e5bcf SHA1 d09f001da23d8b55f8ac681c8546de6800bc9675 SHA256 682db7ec9c22b468fbd43af94f38dceb1b0558897ab0ace69792a2299e396d82
 EBUILD seahorse-3.2.1.ebuild 1652 RMD160 f4edbe69f56e1b5d65a3a2a5936dbd6a3e8fdeb4 SHA1 0dcd0defd126aad9200d81c5eca03edd6027b677 SHA256 9672ec74b0f744cdeff39315778995eafbed24cd1ef00e29758e2726be26b238
-MISC ChangeLog 21851 RMD160 e9e32583d31955dbfc46de7b1c528768db82549d SHA1 e7f07d64b3262a03c1c2bc6a9fc6c92561e46bb7 SHA256 984358712cb2b513c0415e7871368de82539e68a416d0f005745dc2a29622f93
+EBUILD seahorse-3.2.2.ebuild 1652 RMD160 4fa22661295a8e1c850f5deefb92da053d6032a8 SHA1 4f378420c034aa1b3b94fbd23ba2582dcd3ac825 SHA256 78abaf27f758390539ffc29afe9797a032e7ba87eaf26dd6855b74721c48b15a
+MISC ChangeLog 22057 RMD160 21d323dbe44b47c51a4477a9713a0d38d9ffde1a SHA1 d286eb1975e4b94780a64fcabe1c978aaed6104e SHA256 edd06dc890538f61c1af853227888b458e0408a63cfab9047f9aea3e9dc0a12f
 MISC metadata.xml 880 RMD160 c2fb2252ba2952f117e79ee62804d9cab52e4d31 SHA1 5de53e7b87d57d12d56b8b142eafa5fd22e79977 SHA256 8e007848eb55d49181d2e31de6fa2db55ebbf2d8bd5da3274dc7ecdae1d9367c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6s/y0ACgkQdjK8w9WeBnDP8gEAjINLvw7rtbl3GbxtZ9WU2oLK
-xkWickLpmjtRrMFwkTEA/34gjUHHsSg/f7I9yDb1+F0+Wko4wr3P+HrKrd/sTIuN
-=asmk
+iF4EAREIAAYFAk7EpYEACgkQdjK8w9WeBnCRUQEAuc4GmOcBp+r1ZZBjmWpkkrNl
+zfvPen7uX8EDj5g7Pv4A/1Dofb647fIL+FMH/Ii8eRqz+7Xp05y7EMotGLVMcPKs
+=XWag
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/seahorse-3.0.2.ebuild b/app-crypt/seahorse/seahorse-3.2.2.ebuild
index b45284d2c619..27d5d6b0a05e 100644
--- a/app-crypt/seahorse/seahorse-3.0.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.2.2.ebuild
@@ -1,35 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.0.2.ebuild,v 1.1 2011/08/16 23:22:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.2.ebuild,v 1.1 2011/11/17 06:11:08 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 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 +introspection ldap libnotify test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+IUSE="avahi debug doc ldap test"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
-# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="
-	>=gnome-base/gconf-2:2
 	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.90.0:3[introspection?]
-	>=dev-libs/dbus-glib-0.72
-	>=gnome-base/gnome-keyring-2.91.2
+	>=x11-libs/gtk+-2.90.0:3
+	>=gnome-base/gnome-keyring-3.1.5
 	net-libs/libsoup:2.4
 	x11-misc/shared-mime-info
 
@@ -40,9 +30,7 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-1.4* )
 
 	avahi? ( >=net-dns/avahi-0.6 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
 	ldap? ( net-nds/openldap )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
@@ -66,12 +54,9 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-update-mime-database
 		--enable-hkp
-		--with-gtk=3.0
 		$(use_enable avahi sharing)
 		$(use_enable debug)
-		$(use_enable introspection)
 		$(use_enable ldap)
-		$(use_enable libnotify)
 		$(use_enable test tests)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 }
@@ -80,11 +65,7 @@ src_prepare() {
 	# FIXME: Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
 		-e 's/-Werror//' \
-		-i configure.in configure || die "sed 1 failed"
-
-	# FIXME: Disable test not ported to gtk:3
-	sed -e 's/^SUBDIRS = .*/SUBDIRS = /' \
-		-i libcryptui/Makefile.am libcryptui/Makefile.in || die "sed 2 failed"
+		-i configure.ac configure || die "sed 1 failed"
 
 	gnome2_src_prepare
 }