mark 2.0.5 x86 and added new version

8 files changed, 20 insertions, 84 deletions

diff --git a/net-mail/balsa/ChangeLog b/net-mail/balsa/ChangeLog
index 23126ae3e33f..c1db22f515ce 100644
--- a/net-mail/balsa/ChangeLog
+++ b/net-mail/balsa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/balsa
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.30 2003/02/15 04:23:04 seo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.31 2003/03/03 20:23:21 foser Exp $
+
+*balsa-2.0.9 (03 Mar 2003)
+
+  03 Mar 2003; foser <foser@gentoo.org> balsa-2.0.9.ebuild :
+  New version
+  Made it use only libgnomeprint(ui)-2.2 (better anyway)
+  Removed nls USE (obsoleted)
 
 *balsa-2.0.5 (07 Jan 2003)
 
diff --git a/net-mail/balsa/balsa-2.0.5.ebuild b/net-mail/balsa/balsa-2.0.5.ebuild
index 1b78f06ca5bc..0bfbdad0273d 100644
--- a/net-mail/balsa/balsa-2.0.5.ebuild
+++ b/net-mail/balsa/balsa-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.5.ebuild,v 1.4 2003/02/15 04:23:04 seo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.5.ebuild,v 1.5 2003/03/03 20:23:21 foser Exp $
 
 inherit gnome2 eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://balsa.gnome.org"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 RDEPEND="net-mail/mailbase
 	>=dev-libs/glib-2
diff --git a/net-mail/balsa/balsa-2.0.3.ebuild b/net-mail/balsa/balsa-2.0.9.ebuild
index 196f6f6f847b..8a42367ae246 100644
--- a/net-mail/balsa/balsa-2.0.3.ebuild
+++ b/net-mail/balsa/balsa-2.0.9.ebuild
@@ -1,60 +1,42 @@
 # Copyright 1999-2003 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.3.ebuild,v 1.5 2003/02/13 14:23:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.9.ebuild,v 1.1 2003/03/03 20:23:21 foser Exp $
 
-inherit debug gnome2 eutils
+inherit gnome2 eutils
 
 S=${WORKDIR}/${P}
 
-IUSE="nls ssl perl gtkhtml ldap"
-DESCRIPTION="Balsa: Technical Preview email client for GNOME"
+IUSE="ssl gtkhtml perl ldap"
+DESCRIPTION="Email client for GNOME"
 SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
 HOMEPAGE="http://balsa.gnome.org"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND="net-mail/mailbase
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2
 	>=net-libs/libesmtp-0.8.11
-	>=app-text/aspell-0.50
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/gnome-vfs-2
-	=gnome-base/libgnomeprint-1*
-	=gnome-base/libgnomeprintui-1*
-	nls? ( sys-devel/gettext )
+	>=gnome-base/libgnomeprint-2.1.4
+	>=gnome-base/libgnomeprintui-2.1.4
+	>=app-text/aspell-0.50
 	ssl? ( dev-libs/openssl )
 	perl? ( >=dev-libs/libpcre-3.4 )
 	gtkhtml? ( >=gnome-extra/libgtkhtml-2 )
 	ldap? ( net-nds/openldap )"
 
 DEPEND="dev-util/pkgconfig
+	sys-devel/gettext
 	>=app-text/scrollkeeper-0.1.4
 	${RDEPEND}"
 
-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).
-	epatch ${FILESDIR}/${P}-aspell-configure.patch
-
-	# and get our patch in
-	cd ${S}
-	autoconf || die
-}
-
 src_compile() {
 	local myconf
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
 	use ssl \
 		&& myconf="${myconf} --with-ssl" \
 		|| myconf="${myconf} --without-ssl" 
@@ -65,13 +47,6 @@ src_compile() {
 		&& myconf="${myconf} --enable-pcre" \
 		|| myconf="${myconf} --disable-pcre"
 
-#	use spell \
-#		&& myconf="${myconf} --with-aspell" \
-#		|| myconf="${myconf} --without-aspell --without-spell"
-
-#	aspell is not optional atm
-	myconf="${myconf} --with-aspell"
-
 	libmutt/configure \
 		--prefix=/usr \
 		--host=${CHOST} \
diff --git a/net-mail/balsa/files/balsa-2.0.0-gentoo.patch b/net-mail/balsa/files/balsa-2.0.0-gentoo.patch
deleted file mode 100644
index f65068c5f0c1..000000000000
--- a/net-mail/balsa/files/balsa-2.0.0-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- balsa-2.0.0-orig/configure	Mon Mar 25 00:34:33 2002
-+++ balsa-2.0.0/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-2.0.0-varmail.patch b/net-mail/balsa/files/balsa-2.0.0-varmail.patch
deleted file mode 100644
index 64174e305b68..000000000000
--- a/net-mail/balsa/files/balsa-2.0.0-varmail.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rbu2 balsa-2.0.0.orig/libmutt/configure balsa-2.0.0/libmutt/configure
---- balsa-2.0.0.orig/libmutt/configure	2002-06-03 00:15:54.000000000 +0200
-+++ balsa-2.0.0/libmutt/configure	2002-06-03 00:22:42.000000000 +0200
-@@ -8639,7 +8639,5 @@
- fi;
- 	if test $mutt_cv_mailpath = no; then
--		{ { echo "$as_me:8641: error: \"Could not determine where new mail is stored.\"" >&5
--echo "$as_me: error: \"Could not determine where new mail is stored.\"" >&2;}
--   { (exit 1); exit 1; }; }
-+            echo "checking for... Yeah check your ass"
- 	fi
- 	cat >>confdefs.h <<EOF
diff --git a/net-mail/balsa/files/balsa-2.0.3-aspell-configure.patch b/net-mail/balsa/files/balsa-2.0.3-aspell-configure.patch
deleted file mode 100644
index 5aa6a3b4dadb..000000000000
--- a/net-mail/balsa/files/balsa-2.0.3-aspell-configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- balsa-2.0.3.orig/configure.in	2002-10-26 18:08:14.000000000 +0200
-+++ balsa-2.0.3/configure.in	2002-10-30 01:18:02.000000000 +0100
-@@ -89,9 +89,16 @@
- AC_CONFIG_SUBDIRS(libmutt)
- 
- 
--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/digest-balsa-2.0.3 b/net-mail/balsa/files/digest-balsa-2.0.3
deleted file mode 100644
index b9f696cbdea0..000000000000
--- a/net-mail/balsa/files/digest-balsa-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76a8b19117b149387d11a1580e3839b6 balsa-2.0.3.tar.bz2 2431169
diff --git a/net-mail/balsa/files/digest-balsa-2.0.9 b/net-mail/balsa/files/digest-balsa-2.0.9
new file mode 100644
index 000000000000..c6d44a72ef3b
--- /dev/null
+++ b/net-mail/balsa/files/digest-balsa-2.0.9
@@ -0,0 +1 @@
+MD5 f8fc07818ee1d854d77b806d315ba0e2 balsa-2.0.9.tar.bz2 2466308