Update license, EAPI5-ize and de-9999-ize ebuild. Drop keywords due to libsecret dependency (bug #447426).

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 27 insertions, 31 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 0d909b45e667..2347d22832d2 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,11 @@
 # 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.157 2012/12/16 14:49:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.158 2012/12/16 19:16:05 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  seahorse-3.4.1.ebuild, seahorse-3.6.3.ebuild:
+  Update license, EAPI5-ize and de-9999-ize ebuild. Drop keywords due to
+  libsecret dependency (bug #447426).
 
 *seahorse-3.6.3 (16 Dec 2012)
 
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 655af23c1224..a6248f4c4b7c 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -7,14 +7,18 @@ DIST seahorse-2.32.0.tar.bz2 2491230 SHA256 f55468237246a485317d59e2fbc1b1ef5f5b
 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.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
+EBUILD seahorse-3.4.1.ebuild 1689 SHA256 e6273fb1426208f1424d54259c344452222d2ab94fad37590d79dd29808380dc SHA512 ba8051ddb25b7c1ab7c969075ffaac0688963d1eb73c26e50b2fed20bde3f79aa028d6dd507c848ce962a6b8a58757cf2c42148e5c8216a1a9ac1634557e3374 WHIRLPOOL 32fcb3b492c510ce367e01c356aa9e28e775e062ad2df96ca5e64a53e1f4b850a0aca013fa48ff828117ae90fd0d3aefa94648147e7b663307613cba19039387
+EBUILD seahorse-3.6.3.ebuild 1493 SHA256 106fa7968747e0c23d608cc3b092debab3ede511e99226c5a1a56573d3f1394e SHA512 5b884930b734ab72031a770faf1451abfd84abd6c381f3db7daf942818e91d15c72c7a654e1c9181009585e5615629a617beeb57c56c9cfe957bf8371f576f55 WHIRLPOOL 74e93350ba9286c7e49fdd6272838f6939e1d0e133aee3115cddf4541bb26eca47a7e44650f43d294f4755884b475df4b76aa8eca221ee4cc48634d1ad361d89
+MISC ChangeLog 23162 SHA256 44ecda66fa47e81cae008a253ba53c5e0a160a1f017b7250e6ae5f05f375277f SHA512 2b1b0a5a8c92f9cf3cba79eb5e59394961b4ae790a8ae7e1631173397610e55902dd9db418b02fb5ea7e79deba6e3f4d5246e152fc0804d990a2dbdf290ce5d5 WHIRLPOOL 4af09bd63e6fb876feba98752b02eaa33174cc8e0880d0e84fa24da9121eb2e037e31feb561908ef4ecd0522a7f68ad480023c72ef701da5180c98d924af92e3
 MISC metadata.xml 780 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6 SHA512 3e5c6a4edd1ab1ce4353145afbb96a353b126c19295536e1207766fe7348050842e871e93013d63d067078ffe3c017d366e4677390992de2a7d1d9a5775960c1 WHIRLPOOL 39481ab218ed04e835f5447ed74df6d4d26102c8e0f0e48b4f85aea41afa0284b529d28ad937e9d02fef17d52e564c3c765ee8117d8ce3fbc3b08d780dcfcaea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDN330ACgkQ1fmVwcYIWAbvVQCgv4Jwf8Lu7nTtMj15Sc/b6jFH
-ix0AnR1d5P7yhPUGJ4Gi3aTnrY0l2pXG
-=SSV+
+iQEcBAEBCAAGBQJQzh33AAoJEJ0WA1zPCt1hEJgH+gNj6TTige4N45Qj4PLD2cIL
+cX54Gqnw5vMhdx8f8t/Y6UzGotmqEodvPwUbXBpwHSTZ6YvRq79pkGNC5f0EZVlQ
+ew5dWcEdIYMZmz0mPJ66Y7+cTcXpP0pG/Xtfpifnd0JweOX3cNnXxFpp7aDQxBBT
+JadD5lWEB0D6R4uLDc9mQGMK36SvZ9hAVXmc7fdNnEKEhHzdfvljM8sYtEgyVQSa
+BUGMRwc0INx3kFpi3uK0dwBVxNbaSqTr8RDCGbEJzKvR+UAKAah2kYfgLqnGcpnL
+Nssde/370CDrNwTERdpwzwfmdYlWz0cWYVscCYQVETLlJmWKx9cWZL2WBO/EFiE=
+=uZIq
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/seahorse-3.4.1.ebuild b/app-crypt/seahorse/seahorse-3.4.1.ebuild
index 43bb8a1498c4..7ac7b141747e 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.2 2012/12/16 14:49:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.4.1.ebuild,v 1.3 2012/12/16 19:16:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ inherit eutils gnome2
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="avahi debug ldap"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
diff --git a/app-crypt/seahorse/seahorse-3.6.3.ebuild b/app-crypt/seahorse/seahorse-3.6.3.ebuild
index fbf2b6a3c2a6..69d940d1276d 100644
--- a/app-crypt/seahorse/seahorse-3.6.3.ebuild
+++ b/app-crypt/seahorse/seahorse-3.6.3.ebuild
@@ -1,30 +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.6.3.ebuild,v 1.1 2012/12/16 14:49:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.6.3.ebuild,v 1.2 2012/12/16 19:16:05 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 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"
+LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="avahi debug ldap"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
-	>=app-crypt/gcr-3.3.4
+	>=app-crypt/gcr-3.3.4:=
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-3.4:3
 	>=app-crypt/libsecret-0.5
@@ -37,11 +30,10 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-2.0*
 		=app-crypt/gnupg-1.4* )
 
-	avahi? ( >=net-dns/avahi-0.6 )
-	ldap? ( net-nds/openldap )
+	avahi? ( >=net-dns/avahi-0.6:= )
+	ldap? ( net-nds/openldap:= )
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -50,10 +42,6 @@ DEPEND="${COMMON_DEPEND}
 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"
@@ -65,7 +53,6 @@ src_prepare() {
 }
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 	G2CONF="${G2CONF}
 		--enable-pgp
 		--enable-ssh
@@ -74,8 +61,8 @@ src_configure() {
 		--enable-hkp
 		$(use_enable avahi sharing)
 		$(use_enable debug)
-		$(use_enable ldap)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+		$(use_enable ldap)
+		ITSTOOL=$(type -P true)"
 
 	gnome2_src_configure
 }