libgcrypt made into RDEPEND. 0.3.16 and 0.9* now block each other. Version bump added to resupport smime for testing"

6 files changed, 71 insertions, 10 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index d7955aa5b591..ca95de65f67a 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,13 @@
 # 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.44 2004/08/25 14:04:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.45 2004/08/27 13:57:59 dragonheart Exp $
+
+*gpgme-0.9.0-r20 (27 Aug 2004)
+
+  27 Aug 2004; <dragonheart@gentoo.org> gpgme-0.3.16.ebuild, 
+  gpgme-0.9.0-r1.ebuild, +gpgme-0.9.0-r20.ebuild:
+  Fixes gcrypt to be a runtime depend as well. 0.3.16 missing Block on 0.9*.
+  Version added to support smime again
 
   25 Aug 2004; <dragonheart@gentoo.org> metadata.xml, 
   gpgme-0.3.14.ebuild:
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 6f9884f4e6d2..9f97c4756de6 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,14 +1,16 @@
-MD5 eb2d2357221332e06ff4625cbca931ba ChangeLog 7112
 MD5 c91f227a64cd1f967b123962e0f32134 gpgme-0.3.14.ebuild 1045
-MD5 44dcb84da565f66966fc2967567c41f8 gpgme-0.3.16.ebuild 832
+MD5 b4b67d388151a1919ab97bf9f77c5186 gpgme-0.3.16.ebuild 862
 MD5 c60aa07c58226f4a164ab89cff2616a1 gpgme-0.4.0.ebuild 1564
 MD5 8954a02f766eaee7c9dc015c96d1bd12 gpgme-0.4.7.ebuild 1552
 MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
 MD5 9e405b23fd786d03dc7bb10f0da6321f gpgme-0.3.14-r1.ebuild 2396
-MD5 73e4c27f16864460a3fde4b9a484e392 gpgme-0.9.0-r1.ebuild 1263
+MD5 c91637fa5498990a4f168964b5d29ef3 gpgme-0.9.0-r1.ebuild 1348
+MD5 ecfec85b02f3527ff9405ad4643c2e4e gpgme-0.9.0-r20.ebuild 1238
+MD5 032fb9c05440422847c4e8eeb8d23e4a ChangeLog 7373
 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-r1 64
 MD5 260bf91983886d989efa3e54792c921d files/digest-gpgme-0.9.0-r1 63
+MD5 260bf91983886d989efa3e54792c921d files/digest-gpgme-0.9.0-r20 63
diff --git a/app-crypt/gpgme/files/digest-gpgme-0.9.0-r20 b/app-crypt/gpgme/files/digest-gpgme-0.9.0-r20
new file mode 100644
index 000000000000..fd563d5218eb
--- /dev/null
+++ b/app-crypt/gpgme/files/digest-gpgme-0.9.0-r20
@@ -0,0 +1 @@
+MD5 0dd9e49de783669eb307d2e4b897484d gpgme-0.9.0.tar.gz 816291
diff --git a/app-crypt/gpgme/gpgme-0.3.16.ebuild b/app-crypt/gpgme/gpgme-0.3.16.ebuild
index 390185d1d00d..ae6e8d45bc8a 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.7 2004/07/31 02:13:46 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.16.ebuild,v 1.8 2004/08/27 13:57:59 dragonheart Exp $
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/gpgme.html"
@@ -15,7 +15,8 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	>=app-crypt/gnupg-1.0.7
 	sys-apps/gawk
 	sys-devel/libtool
-	sys-devel/gcc"
+	sys-devel/gcc
+	!>=app-crypt/gpgme-0.9"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
diff --git a/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild b/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
index 803be18014f0..2a5b40cae0b9 100644
--- a/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-0.9.0-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/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild,v 1.3 2004/08/23 03:48:15 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.9.0-r1.ebuild,v 1.4 2004/08/27 13:57: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"
@@ -17,15 +17,18 @@ DEPEND=">=app-crypt/gnupg-1.2.4
 	sys-devel/libtool
 	sys-devel/gcc
 	dev-libs/libgpg-error
-	dev-libs/libgcrypt
-	!<=app-crypt/gpgme-0.3.14"
+	!<=app-crypt/gpgme-0.3.14
+	!=app-crypt/gpgme-0.3.16"
 
 # For when gnupg-1.9+ gets unmasked
 #	!smime? ( >=app-crypt/gnupg-1.2.5 )
 #	smime? ( >=app-crypt/gnupg-1.9.10 )
 
 RDEPEND="virtual/libc
-	dev-libs/libgpg-error"
+	dev-libs/libgpg-error
+	dev-libs/libgcrypt
+	!<=app-crypt/gpgme-0.3.14
+	!=app-crypt/gpgme-0.3.16"
 
 src_compile() {
 	if [ -x /usr/bin/gpg2 ]; then
diff --git a/app-crypt/gpgme/gpgme-0.9.0-r20.ebuild b/app-crypt/gpgme/gpgme-0.9.0-r20.ebuild
new file mode 100644
index 000000000000..a1f95dab939c
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-0.9.0-r20.ebuild
@@ -0,0 +1,47 @@
+# 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.9.0-r20.ebuild,v 1.1 2004/08/27 13:57: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"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE="smime"
+
+DEPEND="!smime? ( >=app-crypt/gnupg-1.2.4 )
+	smime? ( >=app-crypt/gnupg-1.9.10 )
+	sys-apps/gawk
+	sys-devel/libtool
+	sys-devel/gcc
+	dev-libs/libgpg-error
+	!<=app-crypt/gpgme-0.3.14
+	!=app-crypt/gpgme-0.3.16"
+
+RDEPEND="virtual/libc
+	dev-libs/libgpg-error
+	dev-libs/libgcrypt
+	!<=app-crypt/gpgme-0.3.14
+	!=app-crypt/gpgme-0.3.16"
+
+src_compile() {
+	if [ -x /usr/bin/gpg2 ]; then
+		GPGBIN=/usr/bin/gpg2
+	else
+		GPGBIN=/usr/bin/gpg
+	fi
+
+	econf \
+		--includedir=/usr/include/gpgme \
+		--with-gpg=$GPGBIN \
+		$(use_with smime gpgsm /usr/bin/gpgsm) \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO VERSION
+}