Fix circular depend with app-crypt/cryptplug as described in bug #55867.

4 files changed, 21 insertions, 13 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index 5fedb64b570f..0f3cd01363f7 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.31 2004/06/24 21:32:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.32 2004/07/14 09:36:59 dragonheart Exp $
+
+  14 Jul 2004; Daniel Black <dragonheart@gentoo.org> gpgme-0.3.16.ebuild,
+  gpgme-0.4.7.ebuild:
+  Fix circular depend with app-crypt/cryptplug as described in bug #55867.
+  Thanks seemant.
 
   04 Jun 2004; Daniel Black <dragonheart@gentoo.org> gpgme-0.4.0.ebuild,
   gpgme-0.4.7.ebuild:
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 8150ae33f26c..78fb8ef81e90 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,10 +1,10 @@
-MD5 d9830ebcd657d4ba6ace011d0c0c1b1e gpgme-0.4.0.ebuild 1578
-MD5 358971947bf513949902762d18555997 gpgme-0.3.16.ebuild 866
-MD5 ae903f1fb9f8fb7fed2d917eea558c8e gpgme-0.4.7.ebuild 1544
-MD5 0e9d79ec3a59e16efdc1d16be2005f7c ChangeLog 4826
+MD5 868d451a84f188d3e8be458810ac7cd9 ChangeLog 5019
+MD5 43f0453aa976efb6569861989358b813 gpgme-0.3.16.ebuild 872
 MD5 dfa56e110b90a85efb3b151f3c27e04d gpgme-0.3.14.ebuild 1068
+MD5 dd3afbb475e7637b2aa20e18942a32f8 gpgme-0.4.7.ebuild 1549
+MD5 d9830ebcd657d4ba6ace011d0c0c1b1e gpgme-0.4.0.ebuild 1578
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14 64
 MD5 f8d60472ee71707fd01798c5677b15ae files/digest-gpgme-0.3.16 64
-MD5 1e195068762b5aafd2f260d76b108a70 files/digest-gpgme-0.4.0 63
 MD5 f61d73bc505b5a542662b75aa0fa219f files/digest-gpgme-0.4.7 63
+MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14 64
+MD5 1e195068762b5aafd2f260d76b108a70 files/digest-gpgme-0.4.0 63
diff --git a/app-crypt/gpgme/gpgme-0.3.16.ebuild b/app-crypt/gpgme/gpgme-0.3.16.ebuild
index a9ffb7ba2485..e86a018abc43 100644
--- a/app-crypt/gpgme/gpgme-0.3.16.ebuild
+++ b/app-crypt/gpgme/gpgme-0.3.16.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/app-crypt/gpgme/gpgme-0.3.16.ebuild,v 1.4 2004/06/24 21:32:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.16.ebuild,v 1.5 2004/07/14 09:36:59 dragonheart Exp $
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/gpgme.html"
@@ -15,8 +15,10 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	>=app-crypt/gnupg-1.0.7
 	sys-apps/gawk
 	sys-devel/libtool
-	sys-devel/gcc
-	crypt? ( app-crypt/cryptplug )"
+	sys-devel/gcc"
+
+#	crypt? ( app-crypt/cryptplug )
+
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
diff --git a/app-crypt/gpgme/gpgme-0.4.7.ebuild b/app-crypt/gpgme/gpgme-0.4.7.ebuild
index bbbd0ed939c7..c6ae8e36b3fc 100644
--- a/app-crypt/gpgme/gpgme-0.4.7.ebuild
+++ b/app-crypt/gpgme/gpgme-0.4.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/app-crypt/gpgme/gpgme-0.4.7.ebuild,v 1.3 2004/06/24 21:32:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.4.7.ebuild,v 1.4 2004/07/14 09:36:59 dragonheart Exp $
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
@@ -16,8 +16,9 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc
-	dev-libs/libgpg-error
-	crypt? ( app-crypt/cryptplug )"
+	dev-libs/libgpg-error"
+
+#	crypt? ( app-crypt/cryptplug )
 
 RDEPEND="nls? ( sys-devel/gettext )
 	dev-libs/libgcrypt"