Version bump for Gnome 3.6. Drop old revision. Re-add keywords that were dropped due to gcr keywording issues.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 58 insertions, 33 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index fbed475c4c51..0d909b45e667 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.156 2012/05/28 00:56:02 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.157 2012/12/16 14:49:32 eva Exp $
+
+*seahorse-3.6.3 (16 Dec 2012)
+
+  16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -seahorse-3.2.2.ebuild,
+  seahorse-3.4.1.ebuild, +seahorse-3.6.3.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Drop old revision. Re-add keywords that were
+  dropped due to gcr keywording issues.
 
   28 May 2012; Matt Turner <mattst88@gentoo.org> seahorse-3.2.2.ebuild:
   Added ~alpha, bug 390345.
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index bb2f47c0e854..655af23c1224 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX seahorse-2.32.0-libnotify-0.7.patch 729 SHA256 8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467 SHA512 a8752d88779969923b8866e5f627e469cb2e3da06e00e8a4fc9cc39f2e5de9c93f17d81fda7ba143e523105a3d1909cfc3b72e460dd3d6fb48bae7970b5cdcea WHIRLPOOL 33ca07d06d5623c6924ebbab5d28a0a4ae3c0d3b226d8083769c308b425535d70b41c9776547335a9efb30f6875fa2e772c9155a99ab824e04ecfd0c108f6ceb
 AUX seahorse-3.4.1-g_clear_object.patch 796 SHA256 18c946f35a465a4713d617bbb8d8987565dc8fb6e8a9ec7902ab9276dce7305f SHA512 df614df31d9a58a7afeba9956ccce2ed9c6ed0ca12ed9a938af4bcca4f05abec4bbd374908601ab26329f77690643c92b891458fcf16dc8576b2563a60904996 WHIRLPOOL 1540c271a1290c19e6492f2129d0f1ba86944fe1b8661269cf798d1f8c100d3427a1969d65170295acaaf3fbd0f44dd71dd04a722e36a8b4df2c50e31db7afc1
 DIST seahorse-2.32.0.tar.bz2 2491230 SHA256 f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d SHA512 b75d94dbce8a00ecec4c230975104b0868f5b51bbcaf18a3b0a2520156c1b1336ad60a978775657fdca0bdabd0ebcd52a5e086a25ed8be1cbae9354245705879 WHIRLPOOL ce686c02f8f3935e963ef2fcf4b334372cb8698eb67353891276c79e3f587e50d3b9cb8bd5291eaff21e1e7bc48a82ddc8fa87a24cdf39e1c1732846d71d1e5d
-DIST seahorse-3.2.2.tar.xz 1964064 SHA256 25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9 SHA512 06e14b3e0017874828027b1278aecddfa39b59cddf8ca7bff910d7a4ef9b9ec0cfbcbed98a2bccd769530f17df8b73430471ef9e9b07b77641bb8876227af2b6 WHIRLPOOL 1f908d61533ce6cc1f1015cfe7e17c4d882df453b49996dfd748c28fb2604922905803b468d32b1205c51d50f3b2996ff8f931b95c51d82f314ddb5b486a4abb
 DIST seahorse-3.4.1.tar.xz 1999472 SHA256 841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa SHA512 9e3fcce4910d27c06b8bf0542b58812557a86f8ab747355b1fbe301f2609872393ee1cbdb69bc8181c246fa01b70c077ad18e26fde76c5c0feb9bf19e22d1153 WHIRLPOOL 8f94b2178f8687c4e99196a5104af25fbf65de15465f7d247471d885c5d1775ece4d709caf6fff4df17282b126a429cf14bab2eb9fe7c7ac22a309282f73e3db
+DIST seahorse-3.6.3.tar.xz 1995252 SHA256 9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1 SHA512 e0a48a6391d46fb80f510f7d881fe87d78281db4f00960f54511121068bd9a8347f07cbd56c76a2a7863e34f9fc6043c6dbe73eea93b85eebdfe7bf5c8193a5c WHIRLPOOL cc66e3176c5ac74611dea7aec7fe9e2b31fc51b9b9b6f5421bc6823b55f8eb8a73895c3f375e4bfad1519ed5966b7f77f0f878253e1cf736a4b2d6255cc80541
 EBUILD seahorse-2.32.0.ebuild 2162 SHA256 badf51a1c01e93ba577a0458f68d3724a2b313a44bba565b6b1696a20b11dfe5 SHA512 484f27fda351e6adb8732da527f091fe2299a56bc909a5a9fc2edc4b00fef795111bd07090c97bf73e8f7feca6b5863ca7bf41c991e64adabbb6bddd1d2607ef WHIRLPOOL 8a565ff071f14a638622473909ae2214192f7a49233e44709151f1807258c2bfbd3135d18087144f532d56f140acfc76e3a5ce9c4010a4ecddda59bd6041a04b
-EBUILD seahorse-3.2.2.ebuild 1650 SHA256 51cbbf7a92989fc5e81a044a20e61c60ad6df29be4df69b870568fd3ca0f9db5 SHA512 4487fdba4bf081269974b7527749d4a93fd791201d4219972dafaf0be78359d8c84b77f4a2361aecd942ec11f61740ab6711b9736eb9c01ea04ea9123cb28e0a WHIRLPOOL 148c654302d0574dd2fc6b69f794918af50532f3d2a1d3027fe83481b1422604e4feeb5d5d838159221fce5dbadbe1ff746bd93d8d4e40a8ef6f95c9e06e45ec
-EBUILD seahorse-3.4.1.ebuild 1647 SHA256 9ec96e75b8ac2b624534be91616942d4af6d1b674843807b2a942282734c6426 SHA512 3e85295e37a53cf923cc2295476ecb4049c96ec6631be00055fd61158bdc61a24bd54ca561584a4dcc5326ed96aaa36f32af78e85f7e90c24117d57fd0107512 WHIRLPOOL 80833b9e4b580bfd05ee50e7d081cd6d4adaf725abe9ae1e22cf0b458d26a30fc0939d00f40a975b5a19c6691b367b3e3b7fa93b24395c178fad2e99a1506544
-MISC ChangeLog 22654 SHA256 04900d6afb448d587df9c3c250b4f665ee6cb7f2100805b6b17340ead6ae8388 SHA512 202acb37546c0968ea1cef1729b15af51035790d3d8e49513058cd08ff7c4418eb19630d4bc8a22398fe95d63864f3844ff080c5deb1235ca13e2c508f518587 WHIRLPOOL 0dbdd5437e2f5ae62537807e32013a6996b377a5708d425096e5c7a5ffa219cafc3843a782ae3906b7c9399f12179c5c11ad8020253cbf6e0683304d0b9a5923
-MISC metadata.xml 880 SHA256 8e007848eb55d49181d2e31de6fa2db55ebbf2d8bd5da3274dc7ecdae1d9367c SHA512 ead53784baa5d179789e224bb45326a8404f6e5ce4258599a9b4d954fb604050fa29132fac6e1e06c2bde166e14784bd78dceb2e58b0beed4a7f11fbaea701ef WHIRLPOOL 58e466880019f540e05db8b67340d0624aa0651c83e8f146dadd2cd79e664878c5347753ac29fa3a22b18fad2b4098ec6bb4f606d093158afd934f86140a114c
+EBUILD seahorse-3.4.1.ebuild 1673 SHA256 b328f4a09398fddf833d63a5bd15499c11910ac74f5771859b5e901243a1e475 SHA512 007632efa8d40f96c3c705284eb554b34e8fbbd35fdfc84b8e7813acb49de7ef312c201971b0c3c3e4966ecc412c8d864de43a5a3f76803dab90a23b86e7b383 WHIRLPOOL 59f42577296ac9c915f291718d44c386099ab470eccf07946dc45451dcd6b278e205e7fe75b06b32a75a7472402f1202d8bf2ac0d7935f31cbd487f18ff189d8
+EBUILD seahorse-3.6.3.ebuild 1790 SHA256 bf813237bcb354a76c507fd50a162d46e7f8dc44522ff6f7c087df6ebf2eb192 SHA512 95681ed3b0eeca8d8ce2ea6e4b88a98eb3db33adda56bf42810fa85c2d503065775c3d23cbe561f65d653dc19cdde65aa8e2ff2f732c6d31cecc9277ec2e80a0 WHIRLPOOL c6976a0c01e1e15df74c89f6cb30954aea2cc784e1b22f45e21362f222fcdcd07adbcacde1664cf2fc5cbceecaee3754a0f71a5b434cc1ced70f1b4dde6c117d
+MISC ChangeLog 22937 SHA256 869e6be714feb46de5c4a880db610fb1979f95c4a19202ca1496ed650b648f36 SHA512 138ed0750a40df4fbca189aaa1f735bf40cf75dfae41600569256f8d50e1847a12de47b273dbff0ac5fe80e87895d4178fb57f453f1fefb2767babe995665e00 WHIRLPOOL de1a8b86fcab9038263df17389fce076054ff361aa88cc9869081ac97359ba68bdcc1b75546e06c3da7895c4e59f94b139e37c933bd7ad5d548266d6c188a770
+MISC metadata.xml 780 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6 SHA512 3e5c6a4edd1ab1ce4353145afbb96a353b126c19295536e1207766fe7348050842e871e93013d63d067078ffe3c017d366e4677390992de2a7d1d9a5775960c1 WHIRLPOOL 39481ab218ed04e835f5447ed74df6d4d26102c8e0f0e48b4f85aea41afa0284b529d28ad937e9d02fef17d52e564c3c765ee8117d8ce3fbc3b08d780dcfcaea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDN330ACgkQ1fmVwcYIWAbvVQCgv4Jwf8Lu7nTtMj15Sc/b6jFH
+ix0AnR1d5P7yhPUGJ4Gi3aTnrY0l2pXG
+=SSV+
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index d5ac32b7394b..06955307321c 100644
--- a/app-crypt/seahorse/metadata.xml
+++ b/app-crypt/seahorse/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use
-	<pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
 	<flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP server.</flag>
 </use>
 <longdescription>Seahorse is a Gnome interface for GnuPG.  It's main purpose is to be a PGP/GPG Key Manager, though 
diff --git a/app-crypt/seahorse/seahorse-3.4.1.ebuild b/app-crypt/seahorse/seahorse-3.4.1.ebuild
index 2feb3d1381f0..43bb8a1498c4 100644
--- a/app-crypt/seahorse/seahorse-3.4.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1.ebuild,v 1.1 2012/05/13 18:18:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.4.1.ebuild,v 1.2 2012/12/16 14:49:32 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="avahi debug ldap"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.3.4
diff --git a/app-crypt/seahorse/seahorse-3.2.2.ebuild b/app-crypt/seahorse/seahorse-3.6.3.ebuild
index e93aca80abb7..fbf2b6a3c2a6 100644
--- a/app-crypt/seahorse/seahorse-3.2.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.6.3.ebuild
@@ -1,25 +1,33 @@
 # 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.2.ebuild,v 1.3 2012/05/28 00:56:02 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.6.3.ebuild,v 1.1 2012/12/16 14:49:32 eva Exp $
 
 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 ldap test"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
+IUSE="avahi debug ldap"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
 
 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
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.5
 	net-libs/libsoup:2.4
 	x11-misc/shared-mime-info
 
@@ -33,39 +41,41 @@ COMMON_DEPEND="
 	ldap? ( net-nds/openldap )
 "
 DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35
 	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 )
 "
 # Need seahorse-plugins git snapshot
 RDEPEND="${COMMON_DEPEND}
 	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
 "
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools"
+fi
+
+src_prepare() {
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	gnome2_src_prepare
+}
 
-pkg_setup() {
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 	G2CONF="${G2CONF}
 		--enable-pgp
 		--enable-ssh
 		--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)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-}
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
-		-e 's/-Werror//' \
-		-i configure.ac configure || die "sed 1 failed"
+		$(use_enable ldap)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 
-	gnome2_src_prepare
+	gnome2_src_configure
 }