new version 'n cleanup

7 files changed, 14 insertions, 143 deletions

diff --git a/net-mail/balsa/ChangeLog b/net-mail/balsa/ChangeLog
index cb9250d5e851..b4ccae034878 100644
--- a/net-mail/balsa/ChangeLog
+++ b/net-mail/balsa/ChangeLog
@@ -1,6 +1,11 @@
 # 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.37 2003/05/03 02:43:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.38 2003/05/15 22:50:22 foser Exp $
+
+*balsa-2.0.11 (15 May 2003)
+
+  15 May 2003; foser <foser@gentoo.org> balsa-2.0.11.ebuild :
+  New version, minor ebuild cleanups
 
   02 May 2003; Jason Wever <weeve@gentoo.org> balsa-1.4.3.ebuild:
   Changed ~sparc keyword to sparc in relation to the mutt related buffer
diff --git a/net-mail/balsa/balsa-2.0.1-r2.ebuild b/net-mail/balsa/balsa-2.0.1-r2.ebuild
deleted file mode 100644
index 03de75a0c2cf..000000000000
--- a/net-mail/balsa/balsa-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.1-r2.ebuild,v 1.9 2003/04/23 00:28:54 vladimir Exp $
-
-IUSE="gtkhtml ssl nls perl"
-
-inherit debug 
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Balsa: Technical Preview 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 sparc  ppc"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	>=net-libs/libesmtp-0.8.11
-	virtual/aspell-dict
-	app-text/scrollkeeper
-	>=gnome-base/libgnome-2.0.1
-	>=gnome-base/libgnomeui-2.0.1
-	>=gnome-base/gnome-vfs-2.0.1
-	>=gnome-base/libgnomeprint-1.115.0
-	>=gnome-base/libgnomeprintui-1.115.0
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	perl? ( >=dev-libs/libpcre-3.4 )
-	gtkhtml? ( >=gnome-extra/libgtkhtml-2.0.0 )"
-
-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
-
-
-	# Workaround for bug #4095, replaces the varmail patch.
-	# by Gabriele Giorgetti <stroke@gentoo.org>
-	#
-	# WARNING: this works for the current (2.0.1) balsa 
-	# version ONLY.
-        cd ${S}/libmutt
-	cp configure configure.orig
-	# skipping some libmutt configure checkings 
-	echo -n "Applying bug #4095 workaround for balsa 2.0.1 ... " 
-	sed -e "6439,6586d" configure.orig > configure
-	echo " done."
-}
-
-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"
-
-	autoconf || die
-	automake || die
-
-	libmutt/configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		--with-mailpath=/var/mail || die "configure libmutt failed"
-
-	myconf="${myconf} --enable-threads"
-
-	econf \
-		--with-aspell=yes \
-		${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-2.0.9-r1.ebuild b/net-mail/balsa/balsa-2.0.11.ebuild
index fbdfe01aefef..dc3ab326b964 100644
--- a/net-mail/balsa/balsa-2.0.9-r1.ebuild
+++ b/net-mail/balsa/balsa-2.0.11.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.9-r1.ebuild,v 1.3 2003/04/25 13:26:45 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.11.ebuild,v 1.1 2003/05/15 22:50:24 foser Exp $
 
 inherit gnome2 eutils
 
@@ -9,19 +9,19 @@ DESCRIPTION="Email client for GNOME"
 SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
 HOMEPAGE="http://balsa.gnome.org"
 
-SLOT="2"
+SLOT="0"
 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
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/libgnomeprint-2.1.4
 	>=gnome-base/libgnomeprintui-2.1.4
+	>=net-libs/libesmtp-0.8.11
 	virtual/aspell-dict
 	ssl? ( dev-libs/openssl )
 	perl? ( >=dev-libs/libpcre-3.4 )
@@ -29,12 +29,12 @@ RDEPEND="net-mail/mailbase
 	ldap? ( net-nds/openldap )"
 
 DEPEND="dev-util/pkgconfig
-	sys-devel/gettext
 	>=app-text/scrollkeeper-0.1.4
 	${RDEPEND}"
 
 src_compile() {
 	local myconf
+
 	use ssl \
 		&& myconf="${myconf} --with-ssl" \
 		|| myconf="${myconf} --without-ssl" 
@@ -54,20 +54,9 @@ src_compile() {
 		--with-mailpath=/var/mail || die "configure libmutt failed"
 
 	# threads diabled because of 17079
-	#myconf="${myconf} --enable-threads"
-	myconf="${myconf} --disable-threads"
+	econf ${myconf} --disable-threads || die "configure balsa failed"
 
-	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/*
-}
+DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
diff --git a/net-mail/balsa/files/balsa-2.0.1-gentoo.patch b/net-mail/balsa/files/balsa-2.0.1-gentoo.patch
deleted file mode 100644
index dc56862b6c6f..000000000000
--- a/net-mail/balsa/files/balsa-2.0.1-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 @@
- 
- 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.1-r2 b/net-mail/balsa/files/digest-balsa-2.0.1-r2
deleted file mode 100644
index 0526b3e46bee..000000000000
--- a/net-mail/balsa/files/digest-balsa-2.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30f867b45b202a34e161f61ced8be73b balsa-2.0.1.tar.bz2 2117754
diff --git a/net-mail/balsa/files/digest-balsa-2.0.11 b/net-mail/balsa/files/digest-balsa-2.0.11
new file mode 100644
index 000000000000..29e3d2dbe3c0
--- /dev/null
+++ b/net-mail/balsa/files/digest-balsa-2.0.11
@@ -0,0 +1 @@
+MD5 1c8ed538818e392e0d2271a3ef2ace84 balsa-2.0.11.tar.bz2 2633518
diff --git a/net-mail/balsa/files/digest-balsa-2.0.9-r1 b/net-mail/balsa/files/digest-balsa-2.0.9-r1
deleted file mode 100644
index c6d44a72ef3b..000000000000
--- a/net-mail/balsa/files/digest-balsa-2.0.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8fc07818ee1d854d77b806d315ba0e2 balsa-2.0.9.tar.bz2 2466308