fix0red

6 files changed, 14 insertions, 67 deletions

diff --git a/net-mail/balsa/ChangeLog b/net-mail/balsa/ChangeLog
index b6b9271f5545..5df7c272ec23 100644
--- a/net-mail/balsa/ChangeLog
+++ b/net-mail/balsa/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2002/05/14 08:05:52 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.8 2002/05/25 21:44:26 seemant Exp $
+
+*balsa-1.3.5-r2 (25 May 2002)
+
+  25 May 2002; Seemant Kulleen <seemant@gentoo.org> balsa-1.3.5-r2.ebuild
+  files/balsa-1.3.5-r2.diff files/digest-balsa-1.3.5-r2 :
+
+  Fixes submitted by: j_r_fonseca@yahoo.co.uk (Jose' Fonseca) in bug 2952
 
 balsa-1.3.5-r1 (11 May 2002) 
 
diff --git a/net-mail/balsa/balsa-1.2.4-r1.ebuild b/net-mail/balsa/balsa-1.2.4-r1.ebuild
deleted file mode 100644
index 1afeffc9965d..000000000000
--- a/net-mail/balsa/balsa-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke (blocke@shivan.org)
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.2.4-r1.ebuild,v 1.2 2002/05/23 06:50:16 seemant Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="Balsa: email client for GNOME"
-SRC_URI="http://www.theochem.kth.se/~pawsa/balsa/${A}"
-HOMEPAGE="http://www.balsa.net"
-
-DEPEND="=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.9.10-r1
-	>=gnome-base/gnome-core-1.4.0.4-r1
-	>=gnome-base/gnome-print-0.30
-	>=gnome-base/ORBit-0.5.10-r1
-	>=media-libs/gdk-pixbuf-0.13.0
-	>=app-text/pspell-0.11.2
-	>=net-libs/libesmtp-0.8.6
-	>=dev-libs/libpcre-3.4
-	gtkhtml? ( >=gnome-extra/gtkhtml-0.16.1 )
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )"
-
-
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	# this patch is from Riccardo Persichetti
-	# (ricpersi@libero.it) to make balsa compile
-	patch -p0 < ${FILESDIR}/balsa-1.2.4.diff
-}
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="$myconf --disable-nls"
-	fi
-
-	if [ "`use ssl`" ] ; then
-		myconf="$myconf --with-ssl"
-	fi
-
-	if [ "`use gtkhtml`" ] ; then
-		myconf="$myconf --with-gtkhtml"
-	fi
-
-	libmutt/configure --prefix=/usr --host=${CHOST} --with-mailpath=/var/mail
-	assert "configure libmutt failed"
-	./configure --prefix=/usr --host=${CHOST} --enable-threads --enable-pcre $myconf
-	assert "configure balsa failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*
-}
-
diff --git a/net-mail/balsa/balsa-1.3.5.ebuild b/net-mail/balsa/balsa-1.3.5-r2.ebuild
index 181175e4d656..8701d89d4aca 100644
--- a/net-mail/balsa/balsa-1.3.5.ebuild
+++ b/net-mail/balsa/balsa-1.3.5-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce A. Locke (blocke@shivan.org)
 # Modified by Riccardo Persichetti (ricpersi@libero.it)
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.3.5.ebuild,v 1.3 2002/05/23 06:50:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.3.5-r2.ebuild,v 1.1 2002/05/25 21:44:26 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Balsa: email client for GNOME"
@@ -27,7 +27,7 @@ src_unpack() {
 	 unpack ${P}.tar.bz2
 	# this patch is from Riccardo Persichetti
 	# (ricpersi@libero.it) to make balsa compile
-	patch -p0 < ${FILESDIR}/${P}.diff
+	patch -p0 < ${FILESDIR}/${PF}.diff
 }
 
 src_compile() {
@@ -54,6 +54,7 @@ src_install () {
 	make \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
+		gnomeconfdir=${D}/etc \
 		gnomedatadir=${D}/usr/share install || die "make install failed"
 	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO
 	docinto docs
diff --git a/net-mail/balsa/files/balsa-1.2.4.diff b/net-mail/balsa/files/balsa-1.3.5-r2.diff
index 45247d77d2bc..92be45444dbe 100644
--- a/net-mail/balsa/files/balsa-1.2.4.diff
+++ b/net-mail/balsa/files/balsa-1.3.5-r2.diff
@@ -1,5 +1,5 @@
---- balsa-1.2.4-orig/configure	Mon Mar 25 00:34:33 2002
-+++ balsa-1.2.4/configure	Tue Apr 23 02:15:35 2002
+--- balsa-1.3.5-orig/configure	Mon Mar 25 00:34:33 2002
++++ balsa-1.3.5/configure	Tue Apr 23 02:15:35 2002
 @@ -6629,7 +6629,7 @@
  #define $ac_tr_lib 1
  EOF
diff --git a/net-mail/balsa/files/digest-balsa-1.2.4-r1 b/net-mail/balsa/files/digest-balsa-1.2.4-r1
deleted file mode 100644
index 3fc8d3fd9d60..000000000000
--- a/net-mail/balsa/files/digest-balsa-1.2.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ffeeb025be60f0b6a151d447ba5c748 balsa-1.2.4.tar.bz2 1975224
diff --git a/net-mail/balsa/files/digest-balsa-1.3.5-r2 b/net-mail/balsa/files/digest-balsa-1.3.5-r2
new file mode 100644
index 000000000000..d68850cc74ed
--- /dev/null
+++ b/net-mail/balsa/files/digest-balsa-1.3.5-r2
@@ -0,0 +1 @@
+MD5 ba83f7054bb31d35c2f7d8d35a9029e3 balsa-1.3.5.tar.bz2 2223158