bump to 2.20.3 and clean old revisions (no stable release for gnome 2.18 - 1.0.1 hence cleaning all)

Package-Manager: portage-2.1.4

15 files changed, 53 insertions, 505 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index aaed8233575e..aafb6a189106 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/seahorse
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.83 2007/11/26 14:21:32 corsair Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.84 2008/01/19 23:01:11 eva Exp $
+
+*seahorse-2.20.3 (19 Jan 2008)
+
+  19 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/seahorse-0.8.2-gpg2.0.patch,
+  -files/seahorse-1.0.1-setuid-agent.patch, -seahorse-0.8.1.ebuild,
+  -seahorse-0.8.2-r1.ebuild, -seahorse-1.0.ebuild, -seahorse-1.0.1.ebuild,
+  -seahorse-2.20.0.ebuild, +seahorse-2.20.3.ebuild:
+  clean up old revisions, bump to 2.20.3 (translation updates)
 
   26 Nov 2007; Markus Rothe <corsair@gentoo.org> seahorse-2.20.1.ebuild:
   Stable on ppc64; bug #199740
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 7adebbaedaae..c70e85a47325 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,68 +1,38 @@
-AUX seahorse-0.8.2-gpg2.0.patch 3653 RMD160 c09d7155c681b21e753214fc2c9fc9fab3865ff1 SHA1 4433dc5ca9f368d0086adc16e72fef9437058453 SHA256 d8feb6b08b5b2782e52353852456199b343f6302bfc033490a03d9468e414aad
-MD5 bc220351dc574bc032a290ba97c13752 files/seahorse-0.8.2-gpg2.0.patch 3653
-RMD160 c09d7155c681b21e753214fc2c9fc9fab3865ff1 files/seahorse-0.8.2-gpg2.0.patch 3653
-SHA256 d8feb6b08b5b2782e52353852456199b343f6302bfc033490a03d9468e414aad files/seahorse-0.8.2-gpg2.0.patch 3653
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX seahorse-0.9.10-update-mime.patch 545 RMD160 f7531dcd900f46b0208226cd1e3806a7bc75231b SHA1 57f486c216b922d5d52cc24ba5925bd854a15518 SHA256 ffa4324d3ec4c4019839f2663758dacd1bb97396582398fdfc241e24dfff549a
 MD5 8803be1ff613ac50fdbdb58f5841488f files/seahorse-0.9.10-update-mime.patch 545
 RMD160 f7531dcd900f46b0208226cd1e3806a7bc75231b files/seahorse-0.9.10-update-mime.patch 545
 SHA256 ffa4324d3ec4c4019839f2663758dacd1bb97396582398fdfc241e24dfff549a files/seahorse-0.9.10-update-mime.patch 545
-AUX seahorse-1.0.1-setuid-agent.patch 530 RMD160 b3feb979de68a0d62489b84c435db51a81716666 SHA1 5675eace4c9293f1b1b6b2c41beb0290600247d0 SHA256 90b9af519eccba6f7bf64ed7ef2b328adb924af520b32ddcf55279627ba68ceb
-MD5 ed61a75d7d17fd2bc3cde513d5f00ea1 files/seahorse-1.0.1-setuid-agent.patch 530
-RMD160 b3feb979de68a0d62489b84c435db51a81716666 files/seahorse-1.0.1-setuid-agent.patch 530
-SHA256 90b9af519eccba6f7bf64ed7ef2b328adb924af520b32ddcf55279627ba68ceb files/seahorse-1.0.1-setuid-agent.patch 530
-DIST seahorse-0.8.1.tar.bz2 971378 RMD160 1442bf55617a08e7357d1b40e64f4d3d3c777bdc SHA1 43b91153c708e536e00ef38aa12f33eff524b0f7 SHA256 1aba14b58f2366beaf32324d95281a03799b4888ac1701f0ec788b43b4117e90
-DIST seahorse-0.8.2.tar.bz2 990284 RMD160 722f060a2d54ff028c7dfcf3e935153ca4996803 SHA1 d97db00a07f4e059a22e1d304e0cc2142ae4ec36 SHA256 350f1a1cc5010bb81f08c6c124a24f2560a9dffea16c8a5a62e9cdeebb03c68e
-DIST seahorse-1.0.1.tar.bz2 1857602 RMD160 c11d2b0ae114cb41d52a3dc068f8a4fafc322603 SHA1 03e5232d47e0d9d16fe7a713b00533859583a8d8 SHA256 6afdbba1629b054c93c9a657f797c574a2bf96c0a6ab15a5d99c5b8ee5601a1b
-DIST seahorse-1.0.tar.bz2 1871080 RMD160 21b2500be16c0143cee0d5e696c3241597bce2f2 SHA1 c2902e2d57bda5a612b252ccbe5a7891708d5e2e SHA256 76bcfeed3843b2357f5ecc1694a471fc45a810aa17fd0baed60f1d32142d0746
-DIST seahorse-2.20.0.tar.bz2 2120569 RMD160 ab3916dcd2bfa07300282696d090fad1a811e7bc SHA1 902efb15908b8d1955d54c08cebc941db3e0b310 SHA256 9536c1f40e8a17abb38cecda9a3916c881615ae5b87dc4aa4a469a3ce347a6a0
 DIST seahorse-2.20.1.tar.bz2 2287702 RMD160 a2508bac5ad9df42edb52ab619abf6320e76d76a SHA1 7e8f5684598cfb7232a804e3462ee5ea583e6254 SHA256 718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf
-EBUILD seahorse-0.8.1.ebuild 1324 RMD160 29dd2c0000b78afe2b159877e336c91ab9b63891 SHA1 687504a5b065798d2e7d9c54200eca0c5e3a6254 SHA256 5c7154e1af1b8c97c53bd6dc3e33dd3c8ff229aa59928ed0a08fa9163c16c525
-MD5 d37936e86bde6ebfcec418dfb8840c2b seahorse-0.8.1.ebuild 1324
-RMD160 29dd2c0000b78afe2b159877e336c91ab9b63891 seahorse-0.8.1.ebuild 1324
-SHA256 5c7154e1af1b8c97c53bd6dc3e33dd3c8ff229aa59928ed0a08fa9163c16c525 seahorse-0.8.1.ebuild 1324
-EBUILD seahorse-0.8.2-r1.ebuild 1620 RMD160 43d1424e52dd6070a8d555e6f575eb996d0af724 SHA1 2dcd792c2f167aede52ff45cdf09834670592158 SHA256 f7fd38981b756b8cdd6cfd96583aa6a5c609105e667dabe2742affe6fb9e8452
-MD5 af7f49404e6ade87febb65809bc66840 seahorse-0.8.2-r1.ebuild 1620
-RMD160 43d1424e52dd6070a8d555e6f575eb996d0af724 seahorse-0.8.2-r1.ebuild 1620
-SHA256 f7fd38981b756b8cdd6cfd96583aa6a5c609105e667dabe2742affe6fb9e8452 seahorse-0.8.2-r1.ebuild 1620
-EBUILD seahorse-1.0.1.ebuild 2654 RMD160 98fc12d6e142cfc818c2ecb666c8eb289bf9a2c9 SHA1 107ef1feaec5255cb18754b60212600884e4b1f9 SHA256 62f6c0b6b7592715e36417222f8dfdc819efdb529cb537c6ce15e6938c2dfe70
-MD5 e31e1da71f148f0414b9102746950be6 seahorse-1.0.1.ebuild 2654
-RMD160 98fc12d6e142cfc818c2ecb666c8eb289bf9a2c9 seahorse-1.0.1.ebuild 2654
-SHA256 62f6c0b6b7592715e36417222f8dfdc819efdb529cb537c6ce15e6938c2dfe70 seahorse-1.0.1.ebuild 2654
-EBUILD seahorse-1.0.ebuild 2548 RMD160 ce80a277f295e2ff8aa008cca96aba742ae28ab2 SHA1 72fdabde6150e0abfee2f2012f2a361798863fa2 SHA256 cb302163ea0a88e373289480d8ef73a0cb8382c6cebe206fbb4fa52ecc19167c
-MD5 33ce48259d7a21fa2e765d32bbefa901 seahorse-1.0.ebuild 2548
-RMD160 ce80a277f295e2ff8aa008cca96aba742ae28ab2 seahorse-1.0.ebuild 2548
-SHA256 cb302163ea0a88e373289480d8ef73a0cb8382c6cebe206fbb4fa52ecc19167c seahorse-1.0.ebuild 2548
-EBUILD seahorse-2.20.0.ebuild 2748 RMD160 92b3d0cbd3ce436f09146cc1d62933aa6fb32a10 SHA1 00a2304019ca0d720b42f901f485a18ef202e68a SHA256 49b564c8ae9169749ff958c646a1fdb857a62bc7c734dbaed72008750b76cd9a
-MD5 101fe183903ec35e168202b4a7e5cec3 seahorse-2.20.0.ebuild 2748
-RMD160 92b3d0cbd3ce436f09146cc1d62933aa6fb32a10 seahorse-2.20.0.ebuild 2748
-SHA256 49b564c8ae9169749ff958c646a1fdb857a62bc7c734dbaed72008750b76cd9a seahorse-2.20.0.ebuild 2748
+DIST seahorse-2.20.3.tar.bz2 2273106 RMD160 e19c4d51b09511b570e90aa37a5b437a95a7404f SHA1 1946c0b6ff6f1dcd2c7d95e446d620592b129d32 SHA256 26aadb8fbd03c2971fdbcbf686dffd93a1f7fe82495510a64f38e53a49ce8442
 EBUILD seahorse-2.20.1.ebuild 2741 RMD160 ecdbff52354ff8e27026927c0fb266231140f3b4 SHA1 3a26c8226cd9354120d3de85468d3bc4474bed1a SHA256 9dcb90d3b0391f846a27a5c83cc9eb4a61ab8d8ad223793f03cc47cd80d6ca8c
 MD5 7420f74784aca8b8395c108b26b45b46 seahorse-2.20.1.ebuild 2741
 RMD160 ecdbff52354ff8e27026927c0fb266231140f3b4 seahorse-2.20.1.ebuild 2741
 SHA256 9dcb90d3b0391f846a27a5c83cc9eb4a61ab8d8ad223793f03cc47cd80d6ca8c seahorse-2.20.1.ebuild 2741
-MISC ChangeLog 12098 RMD160 d571605e7ca4808c2975defb23c02fd1f62b3110 SHA1 9ee57224bdcc32f9530831525f93f878eaa60736 SHA256 fd0735ccab6aa9e2304c7c6ff139dbfa2acf6f6059459a4c1a2a8507d86df616
-MD5 4929d244cf548a8f6630cc6ac1202802 ChangeLog 12098
-RMD160 d571605e7ca4808c2975defb23c02fd1f62b3110 ChangeLog 12098
-SHA256 fd0735ccab6aa9e2304c7c6ff139dbfa2acf6f6059459a4c1a2a8507d86df616 ChangeLog 12098
+EBUILD seahorse-2.20.3.ebuild 2716 RMD160 54e23a0c8d2c436fe2bd63061e0b8b4638783de3 SHA1 09d4a6b5bc39e6009d286493f05b6437be4ec92b SHA256 f9ae78b11105f83530363d31da16dbbf587e15353126d73e674614ef2d3dd941
+MD5 fba1d3ad44ae626f0efb1ae88b20a37e seahorse-2.20.3.ebuild 2716
+RMD160 54e23a0c8d2c436fe2bd63061e0b8b4638783de3 seahorse-2.20.3.ebuild 2716
+SHA256 f9ae78b11105f83530363d31da16dbbf587e15353126d73e674614ef2d3dd941 seahorse-2.20.3.ebuild 2716
+MISC ChangeLog 12477 RMD160 51416b833c413f59e1b5bc9d9e6c24c9db5a2462 SHA1 9947819df83559c0d1b0818cf3918f65e7f501d6 SHA256 a4fab924db5b696711bd0c22e20272a4bf8595a2b63750a9ea0fe50d7a9e1066
+MD5 153678cce9e18f2e656dbe54365f0781 ChangeLog 12477
+RMD160 51416b833c413f59e1b5bc9d9e6c24c9db5a2462 ChangeLog 12477
+SHA256 a4fab924db5b696711bd0c22e20272a4bf8595a2b63750a9ea0fe50d7a9e1066 ChangeLog 12477
 MISC metadata.xml 780 RMD160 c5e95c5325bed2618a42b61f14599216b4bc8bd9 SHA1 043ab719fdc21177c44b7a19054af736d8e7e10e SHA256 231c85c6d4fbf88839ec78311946ccdb3b66b34c1d274b11220672049f1bb099
 MD5 0d1bd8402596d34029899d32c0e6cd46 metadata.xml 780
 RMD160 c5e95c5325bed2618a42b61f14599216b4bc8bd9 metadata.xml 780
 SHA256 231c85c6d4fbf88839ec78311946ccdb3b66b34c1d274b11220672049f1bb099 metadata.xml 780
-MD5 30fc33b66b3cf79327caa59af66b5ce3 files/digest-seahorse-0.8.1 247
-RMD160 6193d90ddd36e642b1ac4b1ee5942459ba6adcc5 files/digest-seahorse-0.8.1 247
-SHA256 84f7fcf984174ae0f4197c7b5565af91e4991c275b61d1611629bfd1a49c6d06 files/digest-seahorse-0.8.1 247
-MD5 91fa4ec99823483ae92a320a6c65c897 files/digest-seahorse-0.8.2-r1 247
-RMD160 3d6bba0f8fd8b34092201715fedf7401b72a96ee files/digest-seahorse-0.8.2-r1 247
-SHA256 836ecee89ee2b4d974b973447bd332b2cc126200e5eee2bf97aadeea59c41c27 files/digest-seahorse-0.8.2-r1 247
-MD5 c5baec42461601194c1d0d9a41e92b04 files/digest-seahorse-1.0 244
-RMD160 67c58edf9854a2f6cc67b21f84174086fa5f4099 files/digest-seahorse-1.0 244
-SHA256 9cd1d08aa46eb827251a1cd34966e527a2d5e0055a453bc3bd2bcbb7fd05d381 files/digest-seahorse-1.0 244
-MD5 e3cf5d5cdc9d03b0bdd9e15d9348e570 files/digest-seahorse-1.0.1 250
-RMD160 7ed23e486af14f788d01acaa9a33eaad8c7ea8f7 files/digest-seahorse-1.0.1 250
-SHA256 98ebfe275aeb22588ccf094f22c6e6aaf163769eef40a2dde5eabf784f1a7838 files/digest-seahorse-1.0.1 250
-MD5 19630e06557b8ba6b26f9da96bdf7a6f files/digest-seahorse-2.20.0 253
-RMD160 33aada1facb7929e08b2298ecb64f392aeca00c8 files/digest-seahorse-2.20.0 253
-SHA256 7338af0b8253a03c0cd97741fa905a172d28e9df838ab944c9ebf3fc59089a25 files/digest-seahorse-2.20.0 253
 MD5 8b2cddb0392758d21e078f5c86cac70e files/digest-seahorse-2.20.1 253
 RMD160 0b51c18be3dd465fca640f7a6577d842f397fa2f files/digest-seahorse-2.20.1 253
 SHA256 14ea31d6d9d698d143b5b39c3a41d954787d70feb5a4b1706954a0449a767692 files/digest-seahorse-2.20.1 253
+MD5 ba0cbcf11b1244d496a68bf5d865d427 files/digest-seahorse-2.20.3 253
+RMD160 58a1fcf72ea27382c2f93a817c915e008694b089 files/digest-seahorse-2.20.3 253
+SHA256 59b954085242e0027cb817d3e415259b583ed50826b614f2f5f062ba1e10a512 files/digest-seahorse-2.20.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeSgUMACgkQ1fmVwcYIWAb+5gCeKCl2bvrR3YCsDqOxbB0pzBVQ
+KLcAn0PO85vBCvscjnE6BGS5HprSnAf9
+=Ajk2
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/digest-seahorse-0.8.1 b/app-crypt/seahorse/files/digest-seahorse-0.8.1
deleted file mode 100644
index 802c7d1a0fa6..000000000000
--- a/app-crypt/seahorse/files/digest-seahorse-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5d69954ff503c625aa2618acde660496 seahorse-0.8.1.tar.bz2 971378
-RMD160 1442bf55617a08e7357d1b40e64f4d3d3c777bdc seahorse-0.8.1.tar.bz2 971378
-SHA256 1aba14b58f2366beaf32324d95281a03799b4888ac1701f0ec788b43b4117e90 seahorse-0.8.1.tar.bz2 971378
diff --git a/app-crypt/seahorse/files/digest-seahorse-0.8.2-r1 b/app-crypt/seahorse/files/digest-seahorse-0.8.2-r1
deleted file mode 100644
index be2633249aaf..000000000000
--- a/app-crypt/seahorse/files/digest-seahorse-0.8.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 24d9a8c3564700d105847934020920bd seahorse-0.8.2.tar.bz2 990284
-RMD160 722f060a2d54ff028c7dfcf3e935153ca4996803 seahorse-0.8.2.tar.bz2 990284
-SHA256 350f1a1cc5010bb81f08c6c124a24f2560a9dffea16c8a5a62e9cdeebb03c68e seahorse-0.8.2.tar.bz2 990284
diff --git a/app-crypt/seahorse/files/digest-seahorse-1.0 b/app-crypt/seahorse/files/digest-seahorse-1.0
deleted file mode 100644
index 93cedc31e559..000000000000
--- a/app-crypt/seahorse/files/digest-seahorse-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7afcb9b40aaa0c232ce8a9e0909fe757 seahorse-1.0.tar.bz2 1871080
-RMD160 21b2500be16c0143cee0d5e696c3241597bce2f2 seahorse-1.0.tar.bz2 1871080
-SHA256 76bcfeed3843b2357f5ecc1694a471fc45a810aa17fd0baed60f1d32142d0746 seahorse-1.0.tar.bz2 1871080
diff --git a/app-crypt/seahorse/files/digest-seahorse-1.0.1 b/app-crypt/seahorse/files/digest-seahorse-1.0.1
deleted file mode 100644
index bcdc461f80b8..000000000000
--- a/app-crypt/seahorse/files/digest-seahorse-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 687b44dff0cf765d193af79de7fe856f seahorse-1.0.1.tar.bz2 1857602
-RMD160 c11d2b0ae114cb41d52a3dc068f8a4fafc322603 seahorse-1.0.1.tar.bz2 1857602
-SHA256 6afdbba1629b054c93c9a657f797c574a2bf96c0a6ab15a5d99c5b8ee5601a1b seahorse-1.0.1.tar.bz2 1857602
diff --git a/app-crypt/seahorse/files/digest-seahorse-2.20.0 b/app-crypt/seahorse/files/digest-seahorse-2.20.0
deleted file mode 100644
index 26d1d83d42be..000000000000
--- a/app-crypt/seahorse/files/digest-seahorse-2.20.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4447cdc2e04905732dd792b5236caa6 seahorse-2.20.0.tar.bz2 2120569
-RMD160 ab3916dcd2bfa07300282696d090fad1a811e7bc seahorse-2.20.0.tar.bz2 2120569
-SHA256 9536c1f40e8a17abb38cecda9a3916c881615ae5b87dc4aa4a469a3ce347a6a0 seahorse-2.20.0.tar.bz2 2120569
diff --git a/app-crypt/seahorse/files/digest-seahorse-2.20.3 b/app-crypt/seahorse/files/digest-seahorse-2.20.3
new file mode 100644
index 000000000000..5e5dc81e7002
--- /dev/null
+++ b/app-crypt/seahorse/files/digest-seahorse-2.20.3
@@ -0,0 +1,3 @@
+MD5 6f03b38cb0a52e682c73be49f244f83b seahorse-2.20.3.tar.bz2 2273106
+RMD160 e19c4d51b09511b570e90aa37a5b437a95a7404f seahorse-2.20.3.tar.bz2 2273106
+SHA256 26aadb8fbd03c2971fdbcbf686dffd93a1f7fe82495510a64f38e53a49ce8442 seahorse-2.20.3.tar.bz2 2273106
diff --git a/app-crypt/seahorse/files/seahorse-0.8.2-gpg2.0.patch b/app-crypt/seahorse/files/seahorse-0.8.2-gpg2.0.patch
deleted file mode 100644
index a0232b99be83..000000000000
--- a/app-crypt/seahorse/files/seahorse-0.8.2-gpg2.0.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Subject: GnuPG 2.0 support for Seahorse
-From: Robin H. Johnson <robbat2@gentoo.org>
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-The following patch fixes the previous hardcoding of 1.4 and 1.2 versions of
-GnuPG to also allow the 2.0 series.
-
-diff -Nuar --exclude '*~' seahorse-0.8.2.orig/configure seahorse-0.8.2/configure
---- seahorse-0.8.2.orig/configure	2006-07-10 10:41:43.000000000 -0700
-+++ seahorse-0.8.2/configure	2007-01-02 17:14:27.474945791 -0800
-@@ -19569,8 +19569,7 @@
- fi;
- 
- if test	"$DO_CHECK" = "yes"; then
--  major_versions="1"
--  minor_versions="2 4"
-+  accept_versions="1.2 1.4 2.0"
-   # Extract the first word of "gpg", so it can be a program name with args.
- set dummy gpg; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -19623,21 +19622,11 @@
- 	micro=`echo $gnupg_version | \
- 		sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
- 
--    for ver in $major_versions; do
--      if test "$ver" = "$major"; then
--
--        # Check the minor version
--        for ver2 in $minor_versions; do
--          if test "$ver2" = "$minor"; then
--
-+	for ver in $accept_versions; do
-+		if test "$ver" = "$major.$minor"; then
-             ok="yes"
-             break
--
--          fi
--        done
--        break
--
--      fi
-+		fi
-     done
- 
-   fi
-diff -Nuar --exclude '*~' seahorse-0.8.2.orig/configure.in seahorse-0.8.2/configure.in
---- seahorse-0.8.2.orig/configure.in	2006-07-10 10:40:35.000000000 -0700
-+++ seahorse-0.8.2/configure.in	2007-01-02 17:15:25.609655647 -0800
-@@ -59,8 +59,7 @@
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 	
- if test	"$DO_CHECK" = "yes"; then
--  major_versions="1"
--  minor_versions="2 4"
-+  accept_versions="1.2 1.4 2.0"
-   AC_PATH_PROG(GNUPG, gpg, no)
-   ok="no"
-   if test "$GNUPG" != "no"; then
-@@ -72,22 +71,12 @@
- 		sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- 	micro=`echo $gnupg_version | \
- 		sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
--    
--    for ver in $major_versions; do
--      if test "$ver" = "$major"; then
--            
--        # Check the minor version 
--        for ver2 in $minor_versions; do
--          if test "$ver2" = "$minor"; then
--                    
-+  
-+	for ver in $accept_versions; do
-+		if test "$ver" = "$major.$minor"; then
-             ok="yes"
-             break
--                    
--          fi
--        done
--        break
--            
--      fi
-+		fi
-     done
-     
-   fi
-diff -Nuar --exclude '*~' seahorse-0.8.2.orig/libseahorse/seahorse-gpg-options.c seahorse-0.8.2/libseahorse/seahorse-gpg-options.c
---- seahorse-0.8.2.orig/libseahorse/seahorse-gpg-options.c	2005-10-05 15:00:24.000000000 -0700
-+++ seahorse-0.8.2/libseahorse/seahorse-gpg-options.c	2007-01-03 04:40:35.770386761 -0800
-@@ -32,7 +32,6 @@
- #include "seahorse-gpg-options.h"
- 
- #define  GPG_CONF_HEADER    "# FILE CREATED BY SEAHORSE\n\n"
--#define  GPG_VERSION_PREFIX   "1."
- 
- static gchar gpg_homedir[MAXPATHLEN];
- static gboolean gpg_options_inited = FALSE;
-@@ -271,9 +270,11 @@
-         /* 
-          * Make sure it's the right version for us to be messing 
-          * around with the configuration file.
-+		 * Both 1.* and 2.* are suitable.
-          */
-         g_return_val_if_fail (engine && engine->version && engine->file_name &&
--                              g_str_has_prefix (engine->version, GPG_VERSION_PREFIX),
-+                              (g_str_has_prefix (engine->version, "1.") ||
-+                               g_str_has_prefix (engine->version, "2.")),
-                               (seahorse_util_gpgme_to_error
-                                (GPG_E (GPG_ERR_INV_ENGINE), err), FALSE));
- 
diff --git a/app-crypt/seahorse/files/seahorse-1.0.1-setuid-agent.patch b/app-crypt/seahorse/files/seahorse-1.0.1-setuid-agent.patch
deleted file mode 100644
index f7a8066655a5..000000000000
--- a/app-crypt/seahorse/files/seahorse-1.0.1-setuid-agent.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- agent/Makefile.in.orig	2007-04-11 01:54:22.000000000 -0500
-+++ agent/Makefile.in	2007-04-11 01:55:00.000000000 -0500
-@@ -742,7 +742,7 @@
- # Don't make the daemon setuid
- # Make the daemon setuid
- @HAVE_USER_MLOCK_FALSE@install-exec-hook:
--@HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-daemon
-+@HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-agent
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/app-crypt/seahorse/seahorse-0.8.1.ebuild b/app-crypt/seahorse/seahorse-0.8.1.ebuild
deleted file mode 100644
index 65628a4a18b8..000000000000
--- a/app-crypt/seahorse/seahorse-0.8.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.1.ebuild,v 1.9 2007/10/17 22:11:45 eva Exp $
-
-inherit gnome2 eutils autotools flag-o-matic
-
-DESCRIPTION="gnome front end to gnupg"
-HOMEPAGE="http://seahorse.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-RDEPEND=">=app-crypt/gnupg-1.2.0
-	>=app-crypt/gpgme-1.0.0
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/gnome-mime-data-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
-	>=app-editors/gedit-2.8.0
-	>=gnome-base/nautilus-2.10
-	dev-util/intltool
-	dev-libs/glib
-	>=net-libs/libsoup-2.2
-	x11-misc/shared-mime-info
-	ldap? ( net-nds/openldap )"
-
-#no ~ppc64 keyword yet 	>=gnome-base/bonobo-activation-2
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-IUSE="ldap"
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-	G2CONF="${G2CONF} $(use_enable ldap) --disable-update-mime-database"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
-}
diff --git a/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild b/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
deleted file mode 100644
index cf6532a3d1d7..000000000000
--- a/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild,v 1.2 2007/10/17 22:11:45 eva Exp $
-
-inherit gnome2 eutils autotools flag-o-matic
-
-DESCRIPTION="gnome front end to gnupg"
-HOMEPAGE="http://seahorse.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gedit gnome ldap"
-
-RDEPEND=">=gnome-base/libgnomeui-2.0
-		 >=gnome-base/gnome-vfs-2.0
-		 >=gnome-base/libglade-2.0
-		 >=gnome-base/gconf-2.0
-		 >=x11-libs/gtk+-2.4
-		 >=dev-libs/glib-2.0
-		 || ( =app-crypt/gnupg-1.4* >=app-crypt/gnupg-2.0.1-r2 )
-		 >=app-crypt/gpgme-1.0.0
-		 >=net-libs/libsoup-2.2
-		   x11-misc/shared-mime-info
-		 gedit? ( >=app-editors/gedit-2.8.0 )
-		 gnome? (
-					>=gnome-base/nautilus-2.10
-					>=gnome-base/libbonobo-2
-					>=gnome-base/libbonoboui-2
-				)
-		 ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=dev-util/intltool-0.34
-		>=dev-util/pkgconfig-0.19
-		>=app-text/scrollkeeper-0.3"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-update-mime-database \
-			$(use_enable debug) \
-			$(use_enable gedit) \
-			$(use_enable gnome nautilus) \
-			$(use_enable ldap)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/${PN}-0.8.2-gpg2.0.patch
-}
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
-}
diff --git a/app-crypt/seahorse/seahorse-1.0.1.ebuild b/app-crypt/seahorse/seahorse-1.0.1.ebuild
deleted file mode 100644
index e5e643a0600c..000000000000
--- a/app-crypt/seahorse/seahorse-1.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.1.ebuild,v 1.8 2007/10/17 22:11:45 eva Exp $
-
-inherit gnome2 eutils flag-o-matic
-
-GNOME_TARBALL_SUFFIX="gz"
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi dbus debug gedit gnome keyring ldap libnotify nautilus"
-
-RDEPEND=">=gnome-base/libgnome-2.14
-		 >=gnome-base/libgnomeui-2.10
-		 >=gnome-base/gnome-vfs-2.0
-		 >=gnome-base/libglade-2.0
-		 >=gnome-base/gconf-2.0
-		 >=dev-libs/glib-2.8
-		 >=x11-libs/gtk+-2.10
-		 >=net-libs/libsoup-2.2
-		 >=dev-libs/libxml2-2.6.0
-		  =app-crypt/gnupg-1.4*
-		 >=app-crypt/gpgme-1.0.0
-		   net-misc/openssh
-		   x11-misc/shared-mime-info
-		 avahi? ( >=net-dns/avahi-0.6 )
-		 dbus?	( >=dev-libs/dbus-glib-0.72 )
-		 gedit? ( >=app-editors/gedit-2.16 )
-		 gnome? ( >=gnome-base/gnome-panel-2.10 )
-		 keyring? ( gnome-base/gnome-keyring )
-		 ldap? ( net-nds/openldap )
-		 libnotify? ( >=x11-libs/libnotify-0.3.2 )
-		 nautilus? ( >=gnome-base/nautilus-2.10 )"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=app-text/gnome-doc-utils-0.3.2
-		>=app-text/scrollkeeper-0.3
-		>=dev-util/pkgconfig-0.20
-		>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-
-pkg_setup() {
-	if ! use dbus ; then
-		if use gedit ; then
-			elog
-			elog "The GEdit plugin requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		if use gnome ; then
-			elog
-			elog "The panel applet requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		eerror "Please add dbus to your USE flags and re-emerge seahorse"
-		eerror "plugins require dbus support"
-	fi
-
-	G2CONF="${G2CONF} --enable-ssh --disable-update-mime-database \
-			--enable-hkp --with-keyserver --enable-agent \
-			--localstatedir=${D}/var/lib/scrollkeeper/ --disable-epiphany \
-			$(use_enable avahi sharing) \
-			$(use_enable dbus) \
-			$(use_enable debug) \
-			$(use_enable gedit) \
-			$(use_enable gnome applet) \
-			$(use_enable keyring gnome-keyring) \
-			$(use_enable ldap) \
-			$(use_enable libnotify) \
-			$(use_enable nautilus)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/${PN}-0.9.10-update-mime.patch
-	epatch "${FILESDIR}"/${PN}-1.0.1-setuid-agent.patch
-}
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
-}
diff --git a/app-crypt/seahorse/seahorse-1.0.ebuild b/app-crypt/seahorse/seahorse-1.0.ebuild
deleted file mode 100644
index 04a043600481..000000000000
--- a/app-crypt/seahorse/seahorse-1.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.ebuild,v 1.8 2007/10/17 22:11:45 eva Exp $
-
-inherit gnome2 eutils flag-o-matic
-
-GNOME_TARBALL_SUFFIX="gz"
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
-IUSE="avahi dbus debug gedit gnome keyring ldap libnotify nautilus"
-
-RDEPEND=">=gnome-base/libgnome-2.14
-		 >=gnome-base/libgnomeui-2.10
-		 >=gnome-base/gnome-vfs-2.0
-		 >=gnome-base/libglade-2.0
-		 >=gnome-base/gconf-2.0
-		 >=dev-libs/glib-2.8
-		 >=x11-libs/gtk+-2.10
-		 >=net-libs/libsoup-2.2
-		 >=dev-libs/libxml2-2.6.0
-		=app-crypt/gnupg-1.4*
-		 >=app-crypt/gpgme-1.1.0
-		   net-misc/openssh
-		   x11-misc/shared-mime-info
-		 avahi? ( >=net-dns/avahi-0.6 )
-		 dbus?	( >=dev-libs/dbus-glib-0.72 )
-		 gedit? ( >=app-editors/gedit-2.16 )
-		 gnome? ( >=gnome-base/gnome-panel-2.10 )
-		 keyring? ( gnome-base/gnome-keyring )
-		 ldap? ( net-nds/openldap )
-		 libnotify? ( >=x11-libs/libnotify-0.3.2 )
-		 nautilus? ( >=gnome-base/nautilus-2.10 )"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=app-text/scrollkeeper-0.3
-		>=dev-util/pkgconfig-0.20
-		>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-
-pkg_setup() {
-	if ! use dbus ; then
-		if use gedit ; then
-			elog
-			elog "The GEdit plugin requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		if use gnome ; then
-			elog
-			elog "The panel applet requires that you build seahorse with DBUS support."
-			elog
-		fi
-
-		eerror "Please add dbus to your USE flags and re-emerge seahorse"
-		eerror "plugins require dbus support"
-	fi
-
-	G2CONF="${G2CONF} --enable-ssh --disable-update-mime-database \
-			--enable-hkp --with-keyserver --enable-agent \
-			--localstatedir=${D}/var/lib/scrollkeeper/ --disable-epiphany \
-			$(use_enable avahi sharing) \
-			$(use_enable dbus) \
-			$(use_enable debug) \
-			$(use_enable gedit) \
-			$(use_enable gnome applet) \
-			$(use_enable keyring gnome-keyring) \
-			$(use_enable ldap) \
-			$(use_enable libnotify) \
-			$(use_enable nautilus)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/${PN}-0.9.10-update-mime.patch
-}
-
-src_compile() {
-	append-ldflags $(bindnow-flags)
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf ${D}/usr/share/mime/{application,magic,globs,XMLnamespaces}
-}
diff --git a/app-crypt/seahorse/seahorse-2.20.0.ebuild b/app-crypt/seahorse/seahorse-2.20.3.ebuild
index c3c531d70039..ced78a19a9ab 100644
--- a/app-crypt/seahorse/seahorse-2.20.0.ebuild
+++ b/app-crypt/seahorse/seahorse-2.20.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.20.0.ebuild,v 1.1 2007/10/03 00:57:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.20.3.ebuild,v 1.1 2008/01/19 23:01:11 eva Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -70,18 +70,21 @@ pkg_setup() {
 		eerror "plugins require dbus support"
 	fi
 
-	G2CONF="${G2CONF} --enable-ssh --disable-update-mime-database \
-			--enable-hkp --with-keyserver --enable-agent \
-			--localstatedir=${D}/var/lib/scrollkeeper/ --disable-epiphany \
-			$(use_enable applet) \
-			$(use_enable avahi sharing) \
-			$(use_enable dbus) \
-			$(use_enable debug) \
-			$(use_enable gedit) \
-			$(use_enable keyring gnome-keyring) \
-			$(use_enable ldap) \
-			$(use_enable libnotify) \
-			$(use_enable nautilus)"
+	G2CONF="${G2CONF}
+		--enable-ssh
+		--disable-update-mime-database
+		--enable-hkp --with-keyserver --enable-agent
+		--localstatedir=${D}/var/lib/scrollkeeper/
+		--disable-epiphany
+		$(use_enable applet)
+		$(use_enable avahi sharing)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable gedit)
+		$(use_enable keyring gnome-keyring)
+		$(use_enable ldap)
+		$(use_enable libnotify)
+		$(use_enable nautilus)"
 }
 
 src_unpack() {