Update license, EAPI5-ize and de-9999-ize ebuild.

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

4 files changed, 22 insertions, 21 deletions

diff --git a/app-crypt/seahorse-sharing/ChangeLog b/app-crypt/seahorse-sharing/ChangeLog
index 844e0f89ba67..4ccdc5a8fcf0 100644
--- a/app-crypt/seahorse-sharing/ChangeLog
+++ b/app-crypt/seahorse-sharing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse-sharing
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-sharing/ChangeLog,v 1.3 2012/12/16 15:00:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-sharing/ChangeLog,v 1.4 2012/12/16 19:20:27 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  seahorse-sharing-3.4.0.ebuild, seahorse-sharing-3.6.1.ebuild:
+  Update license, EAPI5-ize and de-9999-ize ebuild.
 
 *seahorse-sharing-3.6.1 (16 Dec 2012)
 
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
index 06370d8a5da0..597188c4aded 100644
--- a/app-crypt/seahorse-sharing/Manifest
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -3,14 +3,18 @@ Hash: SHA256
 
 DIST seahorse-sharing-3.4.0.tar.xz 279904 SHA256 559b94e4b6fd1e7777c1c9ecd86dd4049d815b8f6b8bf66948cba0346dd397bd SHA512 2303dd500ef2be3d9495eba2a0119821f4e6a0094c993d946f156fc114b7f412333b5697d4f9186e7616b41e2f3ad318a369b2d6b1892266062081ef26976d2e WHIRLPOOL 72acc0b0238df2610e57bec281fe60b23d9df4d2356a9d0e590378a97f81e64da877615fb1f7db553c45c29a10fed9804bf2e619437bfe35c59a3508e9af6b1b
 DIST seahorse-sharing-3.6.1.tar.xz 285720 SHA256 678af1602b1ee08bc2e83d9e6da594f67843a316e0d16c25b5f31dfa6c692ff1 SHA512 fa1baf8abd023517eaf76ad392fc228f8609ef5000cbaa196bb525013f97a82ff9ecf286292a65d0d26f14a5bc445dcee6c4e9c614dee9944291e6090dcb4aca WHIRLPOOL fc74bebc76bb7abbea926617a4c8ac3e1b613cfeb5e5b1fb1d6215dcc179273f13b80b410183c6406717cc3310db866497ae18293886bbcb6f4336c236ad8e9c
-EBUILD seahorse-sharing-3.4.0.ebuild 1367 SHA256 10bf694eb5865dff11ea497431e8c93f454febeee8a2f40ba41791fb8ec2374f SHA512 f379e4d3b606f3810b54cc46ab08bf551881741f264693c627d7ca4f24f26b1587ce41ecd30aecb95c16a63f4ae11f59afdeb621f5d70cba736aa64252f1f1a0 WHIRLPOOL 3d6bc5838e4b58ff5cf08b743768e2521c13b266ef27b199e0cfe45b3891fda2e3ce84bb62a4975b20561865c6fce65fe9ddd3c24f4b5501e8d447b876df0791
-EBUILD seahorse-sharing-3.6.1.ebuild 1681 SHA256 6dbbdc1452d6f2114e0d9b5062ee3e7668db877e542f9a5d12dd567bb1e72251 SHA512 9d7d9896abc101fbba4c2c63cec9f3acf266a32b24ef1816194d2a872007de7274a658e56fbdfec929cedbbf845d9077090e0d6be94283edb93c9bbb883504f8 WHIRLPOOL d65ace3583530ade4e19ef99917ab3d09a7bf809a64e2cbc0189c59bf64dc5e56a2d30389dd4dd2f5772231eda75afb961627f442b3e57dc3980a5a8b56e7856
-MISC ChangeLog 729 SHA256 fe450ec0089e8f18100299bee9b7eedb4bb0695f15bb8ee9cdf374973e40c834 SHA512 3f04c7829c0ffcae1e1196cfb9f9fd34f805c3e3a318a7aafd28a5acb51345bcbe90a3751600d204a860df5f5e327870d897d096be0fd81a6fe16cbf38756df4 WHIRLPOOL c5de3bbcbb92768849d1ae856770bb1dd85e73af283d3f34cb8c1dc1d901ddfe9dc497066fd71e83f01eba51d7f01fb229263c50c17e1e7a8e9b45f66d8c4729
+EBUILD seahorse-sharing-3.4.0.ebuild 1371 SHA256 1cd391f6bd84faeaa44c098260dcc9add0d71ede76581fa259ca59388ca7f69b SHA512 990bb3ed62d5f3c355eec3e74ee463a06f2a525a9079095daa2bd44e702ffd2dfd5bd5a642e3932d77e818a9bd9c652edd9da36ab223d33ef915c9313689e6e7 WHIRLPOOL b17985c7a71736b92165d513ae47177e3bcec7183bbd5f1d663a1ef0fd219bf5960223fb7a3a4ebb5bcf156cf5da4312726aefd3c52504ecabcbed3453ce0641
+EBUILD seahorse-sharing-3.6.1.ebuild 1588 SHA256 be9bbaeed2bea6d89379bc7ddb46387dcf9996758300f1bea1be41ef73d31537 SHA512 575c65db7fceefff02945cc24a48fab0e6f35aacf404686f7b71943c39b605ce978bfdd2044349f1dba1521efc6574167890adec16d68fd00f612ae1f0d9d8cb WHIRLPOOL 3230093b624083a66ae70c55fa0100debb6ec9ac6d34d29b73e38f8e7b6fab2c68d14e2a11a643d59b85624199ae3e13f1b7eedfdf2c326fca74b75ccf1f2909
+MISC ChangeLog 911 SHA256 4022a663af032c68a37fafb5afa4e41c2dbd1a357274b54f8d746d9219304562 SHA512 58a6edf91b1e238559aad542576a0f4f9900ab1afcf257a11a426dacf0bd6cc720c1af1d304fec59e64f1c71b7cde752d0e79e53fa63592d47406cef7caad167 WHIRLPOOL 11f07bacc38188f6d4dc64cfe485e1e25685ea0c26a63b6f7301fc975d6c187f85413e3f897da121b0e1bf2630cf81961a6165097802d90efcfacef0922a9112
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDN4iEACgkQ1fmVwcYIWAapKACeIiyVFBcA8DimuL5eMndOyxAO
-I0wAoL5NbRaDthwqKx3qYCl4mRkHOM1D
-=5jvt
+iQEbBAEBCAAGBQJQzh79AAoJEJ0WA1zPCt1hB6EH9RkvUPcFvXcuCB3hWu2hzKQw
+QdoIGj43w39oreOKD7yNQAiHJRO0lqYBEgrxDLrtI+B1/Rsbff8EG2zmG2Dd/n92
+i6fGUn5noj0IbKjHMgF5NgctmpqlY/zOHgKcn3sTSPdIH7tV6mfTEZDuLmuL6zZo
+dcK0OfgNxXRa4E/coPtIZW/IS1gnshJKIdfsVQy5yWLFuVA5jfxJ9USN5UCzkmY1
+F+pb3J2mkWs+2ISQT08mWCqiRjGYbGnomnr1lytfEG1zFJfGc2zdOUeleRTdb1iU
+YiFsnHl2up3pEQltMVKYT0wPtKINo7bNe3+J6r39ykDeDPw7ZobEUS7DGyPW6w==
+=xgxj
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild
index 867edc48203a..70834c34e8d1 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.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-sharing/seahorse-sharing-3.4.0.ebuild,v 1.2 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-sharing/seahorse-sharing-3.4.0.ebuild,v 1.3 2012/12/16 19:20:27 tetromino Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ inherit gnome2
 DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
 HOMEPAGE="http://projects.gnome.org/seahorse/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild
index ae17cd43b413..52b4d21f7d22 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild
@@ -1,29 +1,22 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild,v 1.1 2012/12/16 15:00:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-sharing/seahorse-sharing-3.6.1.ebuild,v 1.2 2012/12/16 19:20:27 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes" # disable asserts
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
 HOMEPAGE="http://projects.gnome.org/seahorse/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2
-	>=net-dns/avahi-0.6
+	>=net-dns/avahi-0.6:=
 	net-libs/libsoup:2.4
 	>=x11-libs/gtk+-3:3