new aspell instead of pspell-ispell

10 files changed, 81 insertions, 125 deletions

diff --git a/net-mail/balsa/ChangeLog b/net-mail/balsa/ChangeLog
index 424d1ac21810..da5e352da485 100644
--- a/net-mail/balsa/ChangeLog
+++ b/net-mail/balsa/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for net-mail/balsa
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.19 2002/09/06 10:10:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.20 2002/09/11 15:43:12 seemant Exp $
 
 *balsa-1.4.0-r1 (03 Sep 2002)
 
+  11 Sep 2002; Seemant Kulleen <seemant@gentoo.org> balsa-2.0.1-r2.ebuild
+  balsa-1.4.0-r1.ebuild files/balsa-2.0.1-gentoo.diff
+  files/balsa-1.4.0-gentoo.diff :
+
+  Patched up to use the new aspell
+
   06 Sep 2002; Seemant Kulleen <seemant@gentoo.org> balsa-2.0.1-r2.ebuild :
 
   Patch up configure file to find laspell instead of the pspell stuff.
diff --git a/net-mail/balsa/balsa-1.3.6-r2.ebuild b/net-mail/balsa/balsa-1.3.6-r2.ebuild
deleted file mode 100644
index 3592cc470dd1..000000000000
--- a/net-mail/balsa/balsa-1.3.6-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Modified by Riccardo Persichetti (ricpersi@libero.it)
-# /space/gentoo/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.3.5-r1.ebuild,v 1.2 2002/05/23 06:50:16 seemant Exp
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Balsa: email client for GNOME"
-SRC_URI="http://www.theochem.kth.se/~pawsa/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.balsa.net"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.10-r1
-	>=gnome-base/gnome-libs-1.4.1.4
-	>=gnome-base/ORBit-0.5.10-r1
-	>=media-libs/gdk-pixbuf-0.13.0
-	>=net-libs/libesmtp-0.8.11
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	cups? ( >=gnome-base/gnome-print-0.30 )
-	perl? ( >=dev-libs/libpcre-3.4 )
-	spell? ( >=app-text/aspell-0.50 )
-	gtkhtml? ( >=gnome-extra/gtkhtml-0.16.1 )"
-
-src_unpack() {
-	 unpack ${P}.tar.bz2
-	# this patch is from Riccardo Persichetti
-	# (ricpersi@libero.it) to make balsa compile
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die
-}
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use ssl && myconf="${myconf} --with-ssl"
-	use gtkhtml && myconf="${myconf} --with-gtkhtml"
-	use perl && myconf="${myconf} --enable-pcre"
-	use spell && myconf="${myconf} --enable-all"
-
-	libmutt/configure --prefix=/usr \
-		--host=${CHOST} \
-		--with-mailpath=/var/mail || die "configure libmutt failed"
-
-	myconf="${myconf} --enable-threads"
-
-	econf ${myconf} || die "configure balsa failed"
-	emake || die "emake failed"
-}
-
-
-
-src_install () {
-	local myinst
-	myinst="gnomeconfdir=${D}/etc \
-		gnomedatadir=${D}/usr/share"
-
-	einstall ${myinst} || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO
-	docinto docs
-	dodoc docs/*
-}
diff --git a/net-mail/balsa/balsa-1.4.0-r1.ebuild b/net-mail/balsa/balsa-1.4.0-r1.ebuild
index 65c154c62848..cf8a0c04534d 100644
--- a/net-mail/balsa/balsa-1.4.0-r1.ebuild
+++ b/net-mail/balsa/balsa-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later  
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.4.0-r1.ebuild,v 1.1 2002/09/04 06:06:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.4.0-r1.ebuild,v 1.2 2002/09/11 15:43:12 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Balsa: email client for GNOME"
@@ -25,16 +25,26 @@ DEPEND="=dev-libs/glib-1.2*
 	spell? ( >=app-text/aspell-0.50 )
 	gtkhtml? ( >=gnome-extra/gtkhtml-0.16.1 )"
 
+src_unpack() {
+	unpack ${A}
+
+	Patch to use the new aspell instead of the old, crusty pspell modules
+	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
+
+}
+
 src_compile() {
 	local myconf
+
 	use nls || myconf="${myconf} --disable-nls"
 	use ssl && myconf="${myconf} --with-ssl"
 	use gtkhtml && myconf="${myconf} --with-gtkhtml"
 	use perl && myconf="${myconf} --enable-pcre"
-	use spell && myconf="${myconf} --enable-all"
+	use spell && myconf="${myconf} --with-aspell=yes"
 
 	myconf="${myconf} --with-mailpath=/var/mail --enable-threads"
 
+	autoconf || die
 	econf ${myconf} || die "configure balsa failed"
 	emake || die "emake failed"
 }
diff --git a/net-mail/balsa/balsa-2.0.1-r2.ebuild b/net-mail/balsa/balsa-2.0.1-r2.ebuild
index bb963357f0e0..bd5667a7e6f6 100644
--- a/net-mail/balsa/balsa-2.0.1-r2.ebuild
+++ b/net-mail/balsa/balsa-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.1-r2.ebuild,v 1.2 2002/09/06 10:10:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.1-r2.ebuild,v 1.3 2002/09/11 15:43:12 seemant Exp $
 
 inherit debug 
 
@@ -32,18 +32,19 @@ RDEPEND=">=dev-libs/glib-2.0.4
 DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
-	
+
+export WANT_AUTOMAKE_1_4=1
+
 src_unpack() {
 	unpack ${A}
+
 	# this patch is from Riccardo Persichetti
 	# (ricpersi@libero.it) to make balsa compile
+	# <seemant@gentoo.org> this patch is updated by me to compile
+	# against the new aspell (until upstream gets its act together, aspell
+	# will be a required dep).
 	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die
 
-	# this patch is from Seemant Kulleen to make it compile against aspell
-	# instead of the deprecated pspell
-	cd ${S}
-	patch -p0 < ${FILESDIR}/configure.diff || die
-
 
 	# Workaround for bug #4095, replaces the varmail patch.
 	# by Gabriele Giorgetti <stroke@gentoo.org>
@@ -64,15 +65,20 @@ src_compile() {
 	use ssl && myconf="${myconf} --with-ssl"
 	use gtkhtml && myconf="${myconf} --with-gtkhtml"
 	use perl && myconf="${myconf} --enable-pcre"
-# 	use spell && myconf="${myconf} --enable-all"
 
-	libmutt/configure --prefix=/usr \
-	        --host=${CHOST} \
+	autoconf || die
+	automake || die
+
+	libmutt/configure \
+		--prefix=/usr \
+		--host=${CHOST} \
 		--with-mailpath=/var/mail || die "configure libmutt failed"
 
 	myconf="${myconf} --enable-threads"
 
-	econf ${myconf} || die "configure balsa failed"
+	econf \
+		--with-aspell=yes \
+		${myconf} || die "configure balsa failed"
 	emake || die "emake failed"
 }
 
diff --git a/net-mail/balsa/files/balsa-1.3.6-gentoo.patch b/net-mail/balsa/files/balsa-1.3.6-gentoo.patch
deleted file mode 100644
index 8fef65dc05f7..000000000000
--- a/net-mail/balsa/files/balsa-1.3.6-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- balsa-1.3.6-orig/configure	Mon Mar 25 00:34:33 2002
-+++ balsa-1.3.6/configure	Tue Apr 23 02:15:35 2002
-@@ -6629,7 +6629,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpspell $LIBS"
-+  LIBS="-lpspell -lstdc++ $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-
diff --git a/net-mail/balsa/files/balsa-1.3.6.diff b/net-mail/balsa/files/balsa-1.3.6.diff
deleted file mode 100644
index 3ff06d2ceff9..000000000000
--- a/net-mail/balsa/files/balsa-1.3.6.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- balsa-1.3.6-orig/configure	Mon Mar 25 00:34:33 2002
-+++ balsa-1.3.6/configure	Tue Apr 23 02:15:35 2002
-@@ -6627,7 +6627,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpspell $LIBS"
-+  LIBS="-lpspell -lstdc++ $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-
diff --git a/net-mail/balsa/files/balsa-1.4.0-gentoo.diff b/net-mail/balsa/files/balsa-1.4.0-gentoo.diff
new file mode 100644
index 000000000000..2ec9a5276598
--- /dev/null
+++ b/net-mail/balsa/files/balsa-1.4.0-gentoo.diff
@@ -0,0 +1,23 @@
+diff -urN balsa-1.4.0.old/configure.in balsa-1.4.0/configure.in
+--- balsa-1.4.0.old/configure.in	Mon Aug 19 11:04:50 2002
++++ balsa-1.4.0/configure.in	Tue Sep 10 06:19:57 2002
+@@ -49,9 +49,16 @@
+ dnl this should come after `AC_PROG_CC'
+ GNOME_X_CHECKS
+ 
+-AC_CHECK_LIB(pspell, new_pspell_manager,,[
+-	AC_MSG_ERROR([*** libpspell(-devel) not found.  Please check http://balsa.gnome.org/ for information on the required files.])
+-], -lstdc++ -lpspell-modules)
++AC_ARG_WITH(aspell, 
++	[  --with-aspell	Turn on aspell ],
++	 [case "${withval}" in
++	   yes) LIBS="-lstdc++ -laspell" ;
++	   		aspell=true ;;
++	   no) LIBS="-lstdc++" ;
++	   		aspell=false ;;
++		*) AC_MSG_ERROR(bad value ${withval} for --with-aspell) ;;
++	esac],[LIBS=""])
++AM_CONDITIONAL(WITH_ASPELL, test, x$aspell = xtrue)
+ 
+ dnl Reset
+ # LDFLAGS="$balsa_save_LDFLAGS"
diff --git a/net-mail/balsa/files/balsa-2.0.1-gentoo.patch b/net-mail/balsa/files/balsa-2.0.1-gentoo.patch
index aae45a99f7b0..dc56862b6c6f 100644
--- a/net-mail/balsa/files/balsa-2.0.1-gentoo.patch
+++ b/net-mail/balsa/files/balsa-2.0.1-gentoo.patch
@@ -1,12 +1,24 @@
---- balsa-2.0.1-orig/configure	Mon Mar 25 00:34:33 2002
-+++ balsa-2.0.1/configure	Tue Apr 23 02:15:35 2002
-@@ -6629,7 +6629,7 @@
- #define $ac_tr_lib 1
- EOF
+diff -urN balsa-2.0.1.old/configure.in balsa-2.0.1/configure.in
+--- balsa-2.0.1.old/configure.in	Tue Sep 10 06:52:51 2002
++++ balsa-2.0.1/configure.in	Tue Sep 10 06:52:25 2002
+@@ -99,10 +99,16 @@
  
--  LIBS="-lpspell $LIBS"
-+  LIBS="-lpspell -lstdc++ $LIBS"
+ AC_CONFIG_SUBDIRS(libmutt)
  
- else
-   echo "$ac_t""no" 1>&6
-
+-
+-AC_CHECK_LIB(pspell, new_pspell_manager,,[
+-	AC_MSG_ERROR([*** libpspell(-devel) not found.  Please check http://www.balsa.net for information on the required files.])
+-], -lstdc++ -lpspell-modules)
++AC_ARG_WITH(aspell,
++	[  --with-aspell			Turn on aspell ],
++	 [case "${withval}" in
++	 	yes) LIBS="-lstdc++ -laspell" ;
++				aspell=true ;;
++		no) LIBS="-lstdc++" ;
++				aspell=false ;;
++		*) AC_MSG_ERROR(bad value ${withval} for --with-aspell) ;;
++	esac],[LIBS=""])
++AM_CONDITIONAL(WITH_ASPELL, test, x$aspell = xtrue)
+ 
+ dnl Reset
+ # LDFLAGS="$balsa_save_LDFLAGS"
diff --git a/net-mail/balsa/files/configure.diff b/net-mail/balsa/files/configure.diff
deleted file mode 100644
index 5ba9ee1309ea..000000000000
--- a/net-mail/balsa/files/configure.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	Fri Sep  6 02:48:05 2002
-+++ configure.old	Fri Sep  6 02:47:40 2002
-@@ -7650,7 +7650,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
-+LIBS="-laspell -lstdc++ $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 7655 "configure"
- #include "confdefs.h"
diff --git a/net-mail/balsa/files/digest-balsa-1.3.6-r2 b/net-mail/balsa/files/digest-balsa-1.3.6-r2
deleted file mode 100644
index 67b373cc2f5c..000000000000
--- a/net-mail/balsa/files/digest-balsa-1.3.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9960c21ce02ee6218ea9524d1d817986 balsa-1.3.6.tar.bz2 2250436