diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2004-08-16 11:51:19 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2004-08-16 11:51:19 +0000 |
| commit | 97d0f1d7711292d1ed0bc3ede2e23b97dcf5ecb3 (patch) | |
| tree | dd09fd236d738cf74bff8daea959ad3f4fcd1fd3 /mail-client/balsa | |
| parent | Cleaning up a little, getting ready for moving stuff out of FILESDIR (diff) | |
| download | gentoo-2-97d0f1d7711292d1ed0bc3ede2e23b97dcf5ecb3.tar.gz gentoo-2-97d0f1d7711292d1ed0bc3ede2e23b97dcf5ecb3.tar.bz2 gentoo-2-97d0f1d7711292d1ed0bc3ede2e23b97dcf5ecb3.zip | |
modified gpgme-0.3.14-r1 to this needed to change too
Diffstat (limited to 'mail-client/balsa')
| -rw-r--r-- | mail-client/balsa/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-client/balsa/balsa-2.0.15-r2.ebuild | 19 | ||||
| -rw-r--r-- | mail-client/balsa/files/gpgme3-autoconf.patch | 23 |
3 files changed, 15 insertions, 34 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) |