Prefer >=app-crypt/gnupg-2.0.1-r2 over =app-crypt/gnupg-1.4* as a workaround for...

Package-Manager: portage-2.1.2.2_p20070317

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 1168e96c2b41ebf69c188e3bf88c82d3c1f49e56..b79c7fd077e0e1bc0bcfac17874ca31dcc7a93f0 100644 (file)
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.165 2007/03/18 01:50:55 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.166 2007/03/22 20:24:25 zmedico Exp $
+
+  22 Mar 2007; Zac Medico <zmedico@gentoo.org> evolution-2.8.3-r1.ebuild:
+  Prefer >=app-crypt/gnupg-2.0.1-r2 over =app-crypt/gnupg-1.4* as a workaround
+  for bug #171840.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org> evolution-2.6.2-r1.ebuild,
   evolution-2.8.2.1.ebuild, evolution-2.8.2.1-r1.ebuild,

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 410253a1c3135514adf794c85ee97afefc02d33e..2fd9384c815cb9b5090f6b256e71defb29fa8039 100644 (file)
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -57,14 +57,14 @@ EBUILD evolution-2.8.2.1.ebuild 6156 RMD160 0cb4f219cef4533ce3c0f7c63bbad9be4b9e
 MD5 fc2bc5c399f2c202b07aed889e88df10 evolution-2.8.2.1.ebuild 6156
 RMD160 0cb4f219cef4533ce3c0f7c63bbad9be4b9eae9a evolution-2.8.2.1.ebuild 6156
 SHA256 6dd30410a5733f12ed3a55f4de1c278e93b9d94e2286e332cb3b87b1281b0978 evolution-2.8.2.1.ebuild 6156
-EBUILD evolution-2.8.3-r1.ebuild 6622 RMD160 59e19840ef2fe651ac7ffb7f2be1c309e1b3c9c9 SHA1 e1e98df24ba48ad96859686cd21eb25a020a9a4a SHA256 4304fd0ef869866f7bc3ecaac30dd70a110a10a18afa3ace1ec7dea2f1a19f56
-MD5 44c2176672ea76f47005d4bdbd84a2d1 evolution-2.8.3-r1.ebuild 6622
-RMD160 59e19840ef2fe651ac7ffb7f2be1c309e1b3c9c9 evolution-2.8.3-r1.ebuild 6622
-SHA256 4304fd0ef869866f7bc3ecaac30dd70a110a10a18afa3ace1ec7dea2f1a19f56 evolution-2.8.3-r1.ebuild 6622
-MISC ChangeLog 41431 RMD160 f0a328ac702dda66d6a93fc8a29277ba7dfc182d SHA1 98f229edbe6999c8a1bf752c65195c60ccc2ebe1 SHA256 c1a59e567e39d438cc53e53aa10fef9322547f2369e376e86006c63b2a46c82e
-MD5 52a1fe4a94133130446ea5899c95af23 ChangeLog 41431
-RMD160 f0a328ac702dda66d6a93fc8a29277ba7dfc182d ChangeLog 41431
-SHA256 c1a59e567e39d438cc53e53aa10fef9322547f2369e376e86006c63b2a46c82e ChangeLog 41431
+EBUILD evolution-2.8.3-r1.ebuild 6622 RMD160 26988b75fcd8264975701cad78bc69b8ddc6c4b3 SHA1 2b6600af25f27aac436c7725d899d29cebdcd29f SHA256 f7c1cc01084ef119d5bca42345c90943ff99826f92d7afa9a04a1dd0adcace4b
+MD5 f2a3101c8a4999257d8a994cb2c87f71 evolution-2.8.3-r1.ebuild 6622
+RMD160 26988b75fcd8264975701cad78bc69b8ddc6c4b3 evolution-2.8.3-r1.ebuild 6622
+SHA256 f7c1cc01084ef119d5bca42345c90943ff99826f92d7afa9a04a1dd0adcace4b evolution-2.8.3-r1.ebuild 6622
+MISC ChangeLog 41605 RMD160 70bbd72fc942c9f354c9ba06708c14182a92b5a2 SHA1 794fbc00454cb1c324fb4a8d89f8f7732bafb16d SHA256 c2c1da1a8ee19c9ef3829dd636911f343b5bb88944f02b028c49aec5252f4082
+MD5 2f6c379f9517300c626820c03d366844 ChangeLog 41605
+RMD160 70bbd72fc942c9f354c9ba06708c14182a92b5a2 ChangeLog 41605
+SHA256 c2c1da1a8ee19c9ef3829dd636911f343b5bb88944f02b028c49aec5252f4082 ChangeLog 41605
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
@@ -84,7 +84,7 @@ SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/JwV6J2i8a8J4okRAiAVAKCZyEjnjPKqGDe8XVSePhnkc8pVpACgrpmr
-Ns5kBnDG5drw/DENxvQ19bo=
-=WuH+
+iD8DBQFGAuX+/ejvha5XGaMRAqsUAKDfODvuBX+oc8vPzDKV7s069PU8eQCdHnV1
+oiV4nFxyvKHgx5izQFzfpD8=
+=3u10
 -----END PGP SIGNATURE-----

diff --git a/mail-client/evolution/evolution-2.8.3-r1.ebuild b/mail-client/evolution/evolution-2.8.3-r1.ebuild
index f1d21dd1a475d759a8156c9e9cd759710f9944bd..dd89d404e31ec7694fbb541736e94bddf62dad24 100644 (file)
--- a/mail-client/evolution/evolution-2.8.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.3-r1.ebuild,v 1.3 2007/03/18 01:50:55 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.3-r1.ebuild,v 1.4 2007/03/22 20:24:25 zmedico Exp $
 
 inherit eutils flag-o-matic alternatives gnome2 autotools
 
@@ -42,7 +42,7 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2
                >=app-pda/gnome-pilot-2
                >=app-pda/gnome-pilot-conduits-2 )
        spell? ( >=app-text/gnome-spell-1.0.5 )
-       crypt? ( || ( =app-crypt/gnupg-1.4* >=app-crypt/gnupg-2.0.1-r2  ) )
+       crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
        ssl? (
                >=dev-libs/nspr-4.6.1
                >=dev-libs/nss-3.11 )