fixes bug #63501

9 files changed, 28 insertions, 26 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 3ccc1b3b5ada..4948e7b9907a 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.29 2004/08/28 09:04:30 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.30 2004/09/11 10:39:51 hattya Exp $
+
+  11 Sep 2004; Akinori Hattori <hattya@gentoo.org> sylpheed-0.9.10-r1.ebuild,
+  sylpheed-0.9.11.ebuild, sylpheed-0.9.12-r2.ebuild, sylpheed-0.9.12.ebuild,
+  sylpheed-0.9.4.ebuild, sylpheed-0.9.7.ebuild, sylpheed-0.9.8.ebuild:
+  fixes bug #63501.
 
   28 Aug 2004; Akinori Hattori <hattya@gentoo.org> -sylpheed-0.9.12-r1.ebuild:
   cleaned out old ebuild.
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index ccbc01f01596..dbdbde3c78e9 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,14 +1,14 @@
-MD5 a3f993dd1a19623d8300069dec1ac4ba ChangeLog 12866
+MD5 45d57037d1f3f2204e617dc6841a7717 ChangeLog 13113
 MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
-MD5 0175cbb0bd00750d183f105ceba9a0b2 sylpheed-0.9.10-r1.ebuild 1650
-MD5 d55c6e4b70661b478ef4b8cda0504703 sylpheed-0.9.11.ebuild 1654
-MD5 c70b69c5fe45404c60b020523c7f3a21 sylpheed-0.9.12-r2.ebuild 2089
+MD5 9afd5125e0e6a35d631ec76e81879b09 sylpheed-0.9.10-r1.ebuild 1626
+MD5 8b70480a3c60124dfb18cee3ddd9a52f sylpheed-0.9.11.ebuild 1630
+MD5 5632d4374717d8cc851d924014b219f2 sylpheed-0.9.12-r2.ebuild 2081
 MD5 a7c50e8a8f78008a8ed0f6ee078b0928 sylpheed-0.9.12-r3.ebuild 1667
 MD5 fbb293865e5d790d17491c26f2a58f62 sylpheed-0.9.12-r4.ebuild 2131
-MD5 451e7cc54f144f095c6031434982717c sylpheed-0.9.12.ebuild 1774
-MD5 70802173c256dec3b56f72c8ad6d0357 sylpheed-0.9.4.ebuild 1683
-MD5 c9da44749ebbd133a0783ae3fab1111b sylpheed-0.9.7.ebuild 1706
-MD5 801db9e7913f7a30a30b28ae5f80ea11 sylpheed-0.9.8.ebuild 1550
+MD5 d249509722feb4b92d496227237239c9 sylpheed-0.9.12.ebuild 1786
+MD5 c9ce9ff4d9bcd15955cee6414e129105 sylpheed-0.9.4.ebuild 1657
+MD5 2900b8d10269d808f7934195addc95b7 sylpheed-0.9.7.ebuild 1680
+MD5 8e2998c1b960916867be06e9f6140b29 sylpheed-0.9.8.ebuild 1524
 MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10-r1 69
 MD5 cc155b38424780b974f40b662322b2dc files/digest-sylpheed-0.9.11 69
 MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12 69
diff --git a/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild b/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
index 48c3e9ce6207..e6060710d5eb 100644
--- a/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild,v 1.6 2004/08/27 13:22:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild,v 1.7 2004/09/11 10:39:51 hattya Exp $
 
 inherit eutils
 
@@ -21,8 +21,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4
-		 !=app-crypt/gpgme-0.3.14-r1 )
+	crypt? ( <app-crypt/gpgme-0.4 !=app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
 	imlib? ( media-libs/imlib )
 	xface? ( >=media-libs/compface-1.4 )"
diff --git a/mail-client/sylpheed/sylpheed-0.9.11.ebuild b/mail-client/sylpheed/sylpheed-0.9.11.ebuild
index 08d96046ed9f..089f2db7cb5d 100644
--- a/mail-client/sylpheed/sylpheed-0.9.11.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.11.ebuild,v 1.6 2004/08/27 13:22:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.11.ebuild,v 1.7 2004/09/11 10:39:51 hattya Exp $
 
 inherit eutils
 
@@ -21,8 +21,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4
-		 !=app-crypt/gpgme-0.3.14-r1 )
+	crypt? ( <app-crypt/gpgme-0.4 !=app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
 	imlib? ( media-libs/imlib )
 	xface? ( >=media-libs/compface-1.4 )"
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild
index 25f014e7ef98..202013fdc92c 100644
--- a/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild,v 1.4 2004/08/27 13:22:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r2.ebuild,v 1.5 2004/09/11 10:39:51 hattya Exp $
 
 inherit eutils
 
@@ -29,8 +29,7 @@ DEPEND="gtk2? ( >=x11-libs/gtk+-2.2 )
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( <app-crypt/gpgme-0.4
-		 !=app-crypt/gpgme-0.3.14-r1 )
+	crypt? ( <app-crypt/gpgme-0.4 !=app-crypt/gpgme-0.3.14-r1 )
 	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
diff --git a/mail-client/sylpheed/sylpheed-0.9.12.ebuild b/mail-client/sylpheed/sylpheed-0.9.12.ebuild
index 032ccae79e2f..36235ef4fbe9 100644
--- a/mail-client/sylpheed/sylpheed-0.9.12.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12.ebuild,v 1.7 2004/08/22 18:52:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12.ebuild,v 1.8 2004/09/11 10:39:51 hattya Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4 )
+	crypt? ( <app-crypt/gpgme-0.4 !=app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
 	imlib? ( media-libs/imlib )
 	xface? ( >=media-libs/compface-1.4 )"
diff --git a/mail-client/sylpheed/sylpheed-0.9.4.ebuild b/mail-client/sylpheed/sylpheed-0.9.4.ebuild
index cf009a781032..16b5aeac305b 100644
--- a/mail-client/sylpheed/sylpheed-0.9.4.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.4.ebuild,v 1.3 2004/07/14 16:33:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.4.ebuild,v 1.4 2004/09/11 10:39:51 hattya Exp $
 
 IUSE="ssl xface ipv6 nls gnome ldap crypt pda"
 
@@ -20,7 +20,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xface? ( >=media-libs/compface-1.4 )
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
-	crypt? ( >=app-crypt/gnupg-1.0.6 =app-crypt/gpgme-0.3.14 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
 	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	x11-misc/shared-mime-info"
diff --git a/mail-client/sylpheed/sylpheed-0.9.7.ebuild b/mail-client/sylpheed/sylpheed-0.9.7.ebuild
index e89ce0986873..99061f076c3a 100644
--- a/mail-client/sylpheed/sylpheed-0.9.7.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.7.ebuild,v 1.3 2004/07/14 16:33:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.7.ebuild,v 1.4 2004/09/11 10:39:51 hattya Exp $
 
 IUSE="ssl xface ipv6 nls gnome ldap crypt pda"
 
@@ -20,7 +20,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xface? ( >=media-libs/compface-1.4 )
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
-	crypt? ( >=app-crypt/gnupg-1.0.6 =app-crypt/gpgme-0.3.14 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
 	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	x11-misc/shared-mime-info"
diff --git a/mail-client/sylpheed/sylpheed-0.9.8.ebuild b/mail-client/sylpheed/sylpheed-0.9.8.ebuild
index fd72999c3efb..e681e1cc79e1 100644
--- a/mail-client/sylpheed/sylpheed-0.9.8.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.8.ebuild,v 1.3 2004/07/14 16:33:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.8.ebuild,v 1.4 2004/09/11 10:39:51 hattya Exp $
 
 IUSE="ssl xface ipv6 nls gnome ldap crypt pda"
 
@@ -22,7 +22,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( >=app-crypt/gnupg-1.0.6 =app-crypt/gpgme-0.3.14 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
 	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	xface? ( >=media-libs/compface-1.4 )"