modified gpgme-0.3.14-r1 to this needed to change too

5 files changed, 27 insertions, 47 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 18ab6cd9a819..2a64c0a47c1d 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/balsa
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.7 2004/08/09 20:25:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.8 2004/08/16 11:47:19 dragonheart Exp $
+
+  16 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/gpgme3-autoconf.patch, balsa-2.0.15-r2.ebuild:
+  Have modified gpgme-0.3.14-r1 a bit to make it easier. As a result this needed
+  to changed
 
 *balsa-1.4.3 (10 Aug 2004)
 
diff --git a/mail-client/balsa/balsa-2.0.15-r2.ebuild b/mail-client/balsa/balsa-2.0.15-r2.ebuild
index 557866d9b4b4..73092cab8d39 100644
--- a/mail-client/balsa/balsa-2.0.15-r2.ebuild
+++ b/mail-client/balsa/balsa-2.0.15-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/balsa/balsa-2.0.15-r2.ebuild,v 1.1 2004/08/08 03:16:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.0.15-r2.ebuild,v 1.2 2004/08/16 11:47:19 dragonheart Exp $
 
 inherit gnome2 eutils
 
@@ -40,26 +40,25 @@ src_unpack()
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/balsa-gtk+-2.4-deprecation-fix.patch
-
-	if use crypt;
-	then
-		epatch ${FILESDIR}/gpgme3-autoconf.patch
-		sed -i -e s:gpgme\.h:gpgme3.h: libbalsa/rfc3156.c \
-			libbalsa/rfc3156.h src/main.c
-	fi
 }
 
 src_compile() {
 	local myconf
 
-	use crypt && autoconf
+	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
+	if [ -x ${ROOT}/usr/bin/gpg ];
+	then
+		export GPG_PATH=${ROOT}/usr/bin/gpg
+	elif [ -x ${ROOT}/usr/bin/gpg2 ];
+	then
+		export GPG_PATH=${ROOT}/usr/bin/gpg2
+	fi
 
 	libmutt/configure \
 		--prefix=/usr \
 		--host=${CHOST} \
 		--with-mailpath=/var/mail || die "configure libmutt failed"
 
-
 	# threads diabled because of 17079
 	econf \
 		`use_with ssl` \
diff --git a/mail-client/balsa/files/gpgme3-autoconf.patch b/mail-client/balsa/files/gpgme3-autoconf.patch
deleted file mode 100644
index b48b317a5d7d..000000000000
--- a/mail-client/balsa/files/gpgme3-autoconf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.in.orig	2004-08-08 01:03:56.919735072 +0930
-+++ configure.in	2004-08-08 01:06:51.330220648 +0930
-@@ -102,7 +102,7 @@
- 		CFLAGS="$CFLAGS -I$have_gpgme/include"
- 	fi
- 	AC_MSG_CHECKING([gpgme library version])
--	AC_TRY_RUN([#include <gpgme.h>
-+	AC_TRY_RUN([#include <gpgme3.h>
- 		    #include <stdio.h>
- 		    int main() {
- 			char gv[] = GPGME_VERSION;
-@@ -115,9 +115,9 @@
- 		AC_DEFINE(HAVE_GPGME,1,[Defined when gpgme is available.])
- 		if test x"$have_gpgme" != xyes ; then
- 			BALSA_CFLAGS="$BALSA_CFLAGS -I$have_gpgme/include"
--			BALSA_LIBS="$BALSA_LIBS -L$have_gpgme/lib -lgpgme"
-+			BALSA_LIBS="$BALSA_LIBS -L$have_gpgme/lib -lgpgme3"
- 		else
--			BALSA_LIBS="$BALSA_LIBS -lgpgme"
-+			BALSA_LIBS="$BALSA_LIBS -lgpgme3"
- 		fi
- 		have_gpgme=yes
- 		AC_PATH_PROG(gpg_path, gpg)
diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index e212715321c8..db1c26bebbb4 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/sylpheed-claws
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.11 2004/08/11 13:37:23 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.12 2004/08/16 11:50:01 dragonheart Exp $
+
+  16 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  sylpheed-claws-0.9.12-r1.ebuild:
+  Have modified gpgme-0.3.14-r1 a bit to make it easier. As a result this needed
+  to changed
 
   11 Aug 2004; Danny van Dyk <kugelfang@gentoo.org>
   sylpheed-claws-0.9.12.ebuild:
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12-r1.ebuild
index 857c379af930..e2a9c0f70bef 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12-r1.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12-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-claws/sylpheed-claws-0.9.12-r1.ebuild,v 1.1 2004/08/09 10:57:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12-r1.ebuild,v 1.2 2004/08/16 11:50:01 dragonheart Exp $
 
 IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
@@ -18,9 +18,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 
-COMMONDEPENDS="=x11-libs/gtk+-1.2*
+COMMONDEPEND="=x11-libs/gtk+-1.2*
 	pda? ( >=app-pda/jpilot-0.99 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )
 	ldap? ( >=net-nds/openldap-2.0.7 )
@@ -33,10 +33,11 @@ COMMONDEPENDS="=x11-libs/gtk+-1.2*
 	pdflib? ( virtual/ghostscript )
 	nls? ( >=sys-devel/gettext-0.12 )"
 
-DEPEND="${COMMONDEPENDS}
+
+DEPEND="${COMMONDEPEND}
 	>=sys-apps/sed-4"
 
-RDEPEND="${COMMONDEPENDS}
+RDEPEND="${COMMONDEPEND}
 	app-misc/mime-types
 	net-mail/metamail
 	x11-misc/shared-mime-info"
@@ -76,13 +77,6 @@ src_compile() {
 	myconf="${myconf} `use_enable clamav clamav-plugin`"
 	myconf="${myconf} `use_enable xface compface`"
 
-	echo config=${myconf}
-
-	sed -i -e 's:<gpgme\.h:<gpgme3.h:' ./src/passphrase.h ./src/rfc2015.c \
-		./src/pgpmime.c ./src/select-keys.h ./src/main.c ./src/sgpgme.c \
-		./src/sgpgme.h
-
-
 	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
 	econf \
 		--program-suffix=-claws \