+ quick assuan fix, closing bug #66362

5 files changed, 109 insertions, 5 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index 4c9cfd18229a..26148d4968f1 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,14 @@
 # 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.53 2004/10/05 11:01:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.54 2004/10/13 17:26:20 voxus Exp $
+
+*gpgme-1.0.0-r2 (13 Oct 2004)
+
+  13 Oct 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  +files/gpgme-1.0.0-assuan_fix.patch,
+  +gpgme-1.0.0-r2.ebuild:
+  Trivial configure fix, closing bug #66362.
+  Thanks to Gregorio Guidi <g.guidi@sns.it>.
 
   05 Oct 2004; Guy Martin <gmsoft@gentoo.org> gpgme-0.3.14-r1.ebuild:
   Stable on hppa.
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 474b1bc8ec2b..6243d4468e8b 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,21 +1,24 @@
-MD5 9581840d6b9141872e2a9de0eef43a7b ChangeLog 8471
-MD5 92d837b4c91d68c8d9728dc23da7fee5 gpgme-0.3.14-r1.ebuild 2387
 MD5 c91f227a64cd1f967b123962e0f32134 gpgme-0.3.14.ebuild 1045
 MD5 b4b67d388151a1919ab97bf9f77c5186 gpgme-0.3.16.ebuild 862
 MD5 c60aa07c58226f4a164ab89cff2616a1 gpgme-0.4.0.ebuild 1564
 MD5 078cdd0af281263b34748a7df7dc51a9 gpgme-0.4.7.ebuild 1553
+MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
+MD5 92d837b4c91d68c8d9728dc23da7fee5 gpgme-0.3.14-r1.ebuild 2387
 MD5 20d5b25e4a227aa7bfcd000a603a3f0a gpgme-0.9.0-r1.ebuild 1338
 MD5 ecfec85b02f3527ff9405ad4643c2e4e gpgme-0.9.0-r20.ebuild 1238
-MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
 MD5 7293e3a0f7d2859c3fb1fa8e8f3130c0 gpgme-1.0.0-r1.ebuild 1979
 MD5 b9a7f6e3b2075dd0cc14cb4c141cccf2 gpgme-1.0.0.ebuild 1805
+MD5 40ea67e751a6283490d5cad8bdb66c4c gpgme-1.0.0-r2.ebuild 2048
+MD5 8bc568e267bfbbcf5ad037e111791667 ChangeLog 8712
 MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14 64
-MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14-r1 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
 MD5 8607f302e5645b608abfb7b1d84e5fe5 files/digest-gpgme-1.0.0 63
 MD5 8607f302e5645b608abfb7b1d84e5fe5 files/digest-gpgme-1.0.0-r1 63
 MD5 08b94d6859a4d95e2d4405eb16977095 files/gpgme-1.0.0-testconfigure.patch 547
+MD5 91a9a75ed83bb440a634d78c1fe07eb6 files/gpgme-1.0.0-assuan_fix.patch 426
+MD5 8607f302e5645b608abfb7b1d84e5fe5 files/digest-gpgme-1.0.0-r2 63
diff --git a/app-crypt/gpgme/files/digest-gpgme-1.0.0-r2 b/app-crypt/gpgme/files/digest-gpgme-1.0.0-r2
new file mode 100644
index 000000000000..48eb96ac4cac
--- /dev/null
+++ b/app-crypt/gpgme/files/digest-gpgme-1.0.0-r2
@@ -0,0 +1 @@
+MD5 1abf7accd905c435da567d0852c080af gpgme-1.0.0.tar.gz 810646
diff --git a/app-crypt/gpgme/files/gpgme-1.0.0-assuan_fix.patch b/app-crypt/gpgme/files/gpgme-1.0.0-assuan_fix.patch
new file mode 100644
index 000000000000..027b9767ae93
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.0.0-assuan_fix.patch
@@ -0,0 +1,12 @@
+diff -u -r1.87 configure.ac
+--- configure.ac        30 Sep 2004 01:32:17 -0000      1.87
++++ configure.ac        30 Sep 2004 21:52:25 -0000
+@@ -330,7 +330,7 @@
+   AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM", [Path to the GPGSM binary.])
+   AC_SUBST(GPGSM)
+ fi
+-AM_CONDITIONAL(HAVE_GPGSM, [test -n "$GPGSM"])
++AM_CONDITIONAL(HAVE_GPGSM, ["$GPGSM" != "no"])
+ dnl Check for GPGSM version requirement.
+ GPGSM_VERSION=unknown
+ ok=maybe
\ No newline at end of file
diff --git a/app-crypt/gpgme/gpgme-1.0.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..451b827d694c
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.0.0-r2.ebuild
@@ -0,0 +1,80 @@
+# 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-1.0.0-r2.ebuild,v 1.1 2004/10/13 17:26:20 voxus Exp $
+
+inherit eutils
+
+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/gpgme/${P}.tar.gz"
+#SRC_URI="mirror://gnu/gcrypt/gpgme/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~x86"
+#IUSE=""
+IUSE="smime"
+
+DEPEND="sys-apps/gawk
+	sys-devel/libtool
+	sys-devel/gcc
+	>=dev-libs/libgpg-error-0.5
+	!<=app-crypt/gpgme-0.3.14
+	!=app-crypt/gpgme-0.3.16
+	!ia64? ( !ppc64? ( dev-libs/pth ) )
+	!smime? ( >=app-crypt/gnupg-1.2.6 )
+	smime? ( >=app-crypt/gnupg-1.9.10 )"
+
+# For when gnupg-1.9+ gets unmasked
+#	!smime? ( >=app-crypt/gnupg-1.2.2 )
+#	smime? ( >=app-crypt/gnupg-1.9.6 )
+
+RDEPEND="virtual/libc
+	>=dev-libs/libgpg-error-0.5
+	dev-libs/libgcrypt
+	>=app-crypt/gnupg-1.2.4
+	!ia64? ( !ppc64? ( dev-libs/pth ) )
+	!<=app-crypt/gpgme-0.3.14
+	!=app-crypt/gpgme-0.3.16
+	!smime? ( >=app-crypt/gnupg-1.2.6 )
+	smime? ( >=app-crypt/gnupg-1.9.10 )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gpgme-1.0.0-testconfigure.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}-assuan_fix.patch || die "assuan fix failed"
+}
+src_compile() {
+
+	WANT_AUTOCONF=2.57
+	autoconf || die "failed to autoconfigure"
+
+	if [ -x /usr/bin/gpg2 ]; then
+		GPGBIN=/usr/bin/gpg2
+	else
+		GPGBIN=/usr/bin/gpg
+	fi
+
+	# For when gnupg-1.9+ gets unmasked
+	#	$(use_with smime gpgsm /usr/bin/gpgsm) \
+
+	econf \
+		$(use_with smime gpgsm /usr/bin/gpgsm) \
+		--includedir=/usr/include/gpgme \
+		--with-gpg=$GPGBIN \
+		--with-pth=yes \
+		`use_enable smime test` \
+		|| die "econf failed"
+	emake CFLAGS="${CFLAGS} -I../assuan/"  || die
+}
+
+src_test() {
+	einfo "testing currently broken"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO VERSION
+}