5 files changed, 80 insertions, 4 deletions
diff --git a/app-crypt/cryptplug/ChangeLog b/app-crypt/cryptplug/ChangeLog
index 95c003b302f4..3ffe513ef78b 100644
--- a/app-crypt/cryptplug/ChangeLog
+++ b/app-crypt/cryptplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/cryptplug
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cryptplug/ChangeLog,v 1.14 2004/07/03 14:57:41 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cryptplug/ChangeLog,v 1.15 2004/08/08 03:19:52 dragonheart Exp $
+
+*cryptplug-0.3.16-r1 (07 Aug 2004)
+
+  07 Aug 2004; Daniel Black <dragonheart@gentoo.org> +files/gpgme3.patch,
+  +cryptplug-0.3.16-r1.ebuild:
+  version bump for bug #57193
 
   03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> cryptplug-0.3.16.ebuild:
   Stable on alpha.
diff --git a/app-crypt/cryptplug/Manifest b/app-crypt/cryptplug/Manifest
index 1414654c7c7e..4c57ee9071f6 100644
--- a/app-crypt/cryptplug/Manifest
+++ b/app-crypt/cryptplug/Manifest
@@ -1,8 +1,10 @@
-MD5 f9d108b7d5f05599aac954da8d17d8a5 cryptplug-0.3.16.ebuild 725
-MD5 3480064c38ab809449a962b5ea8608f9 cryptplug-0.3.15.ebuild 564
 MD5 ee0a072c0d2e96af2477b85ba58d685a ChangeLog 1715
+MD5 3480064c38ab809449a962b5ea8608f9 cryptplug-0.3.15.ebuild 564
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 f9d108b7d5f05599aac954da8d17d8a5 cryptplug-0.3.16.ebuild 725
+MD5 366b6b675b69f6e407b6c17813fe74a7 cryptplug-0.3.16-r1.ebuild 728
 MD5 6881ee9859f4eed2fd6de2fa539260f1 files/digest-cryptplug-0.3.15 68
-MD5 fcd6801f3b4a1d686f007e21116d0068 files/digest-cryptplug-0.3.16 68
 MD5 cdccd69cf2aa5ae99581ec0f966ba4ed files/cryptplug-0.3.16-64bit.dif 452
 MD5 6768ce3b7b579632728e609be93e902c files/cryptplug-0.3.16-initialize-fix.diff 365
+MD5 fcd6801f3b4a1d686f007e21116d0068 files/digest-cryptplug-0.3.16 68
+MD5 fcd6801f3b4a1d686f007e21116d0068 files/digest-cryptplug-0.3.16-r1 68
diff --git a/app-crypt/cryptplug/cryptplug-0.3.16-r1.ebuild b/app-crypt/cryptplug/cryptplug-0.3.16-r1.ebuild
new file mode 100644
index 000000000000..76ad688f4e41
--- /dev/null
+++ b/app-crypt/cryptplug/cryptplug-0.3.16-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cryptplug/cryptplug-0.3.16-r1.ebuild,v 1.1 2004/08/08 03:19:52 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="GPG and S/MIME encryption plugins.  Use by KMail v1.5 (KDE 3.1) and Mutt"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/cryptplug/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE=""
+
+RDEPEND="=app-crypt/gpgme-0.3.14-r1
+	virtual/libc"
+
+DEPEND="${RDEPEND}
+	sys-apps/gawk
+	sys-apps/grep
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/cryptplug-0.3.16-64bit.dif
+	epatch ${FILESDIR}/cryptplug-0.3.16-initialize-fix.diff
+	epatch ${FILESDIR}/gpgme3.patch
+}
+
+src_compile() {
+	autoconf || die "autoconfigure failed"
+	econf || "configure failed"
+	emake || "make failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die
+}
diff --git a/app-crypt/cryptplug/files/digest-cryptplug-0.3.16-r1 b/app-crypt/cryptplug/files/digest-cryptplug-0.3.16-r1
new file mode 100644
index 000000000000..60c6f5f19df3
--- /dev/null
+++ b/app-crypt/cryptplug/files/digest-cryptplug-0.3.16-r1
@@ -0,0 +1 @@
+MD5 c4f2bda9446dcca6c5ca31cd35bf2290 cryptplug-0.3.16.tar.gz 224964
diff --git a/app-crypt/cryptplug/files/gpgme3.patch b/app-crypt/cryptplug/files/gpgme3.patch
new file mode 100644
index 000000000000..563f433d601f
--- /dev/null
+++ b/app-crypt/cryptplug/files/gpgme3.patch
@@ -0,0 +1,27 @@
+diff -ru cryptplug-0.3.16.prepatch/configure.ac cryptplug-0.3.16/configure.ac
+--- cryptplug-0.3.16.prepatch/configure.ac	2003-05-13 20:47:26.000000000 +0930
++++ cryptplug-0.3.16/configure.ac	2004-08-07 17:21:33.828494216 +0930
+@@ -81,9 +81,9 @@
+     [gpgme_config_prefix=$withval], [gpgme_config_prefix=])
+ if test "$cryptplug_gpgme" != "no"; then
+     if test x$gpgme_config_prefix != x ; then
+-        GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
++        GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme3-config"
+     fi
+-    AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
++    AC_PATH_PROG(GPGME_CONFIG, gpgme3-config, no)
+     if test "$GPGME_CONFIG" = "no"; then
+         GPGME_CFLAGS=
+         GPGME_LIBS=
+diff -ru cryptplug-0.3.16.prepatch/gpgme/gpgmeplug.c cryptplug-0.3.16/gpgme/gpgmeplug.c
+--- cryptplug-0.3.16.prepatch/gpgme/gpgmeplug.c	2004-08-07 17:20:32.650794640 +0930
++++ cryptplug-0.3.16/gpgme/gpgmeplug.c	2004-08-07 17:21:33.886485400 +0930
+@@ -57,7 +57,7 @@
+ #define BUG_URL "http:://www.gnupg.org/aegypten/"
+ #endif
+ 
+-#include "gpgme.h"
++#include "gpgme3.h"
+ #ifndef GPGMEPLUG_PROTOCOL
+ #define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_OpenPGP
+ #endif