Added workaround for bug #4095, it replaces the varmail patch which has been removed. (Closes bug #4095)

Updated deps, and removed old balsa2 files.

7 files changed, 34 insertions, 109 deletions

diff --git a/net-mail/balsa/ChangeLog b/net-mail/balsa/ChangeLog
index 3d6c775d4832..513d3f7f7dbb 100644
--- a/net-mail/balsa/ChangeLog
+++ b/net-mail/balsa/ChangeLog
@@ -1,7 +1,12 @@
 # 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.15 2002/06/18 01:47:39 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.16 2002/07/02 01:55:07 stroke Exp $
 
+balsa-2.0.1-r1 (02 Jul 2002)
+  02 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> balsa-2.0.1-r1.ebuild :
+  Added workaround for bug #4095, it replaces the varmail patch which has
+  been removed. (Closes bug #4095)
+  Updated deps.
 
 *balsa-2.0.1 (17 Jun 2002)
   17 Jun 2002; Spider< spider @gentoo.org> balsa-2.0.1.ebuild :
diff --git a/net-mail/balsa/balsa-2.0.0_pre1.ebuild b/net-mail/balsa/balsa-2.0.0_pre1.ebuild
deleted file mode 100644
index e95c6d17976a..000000000000
--- a/net-mail/balsa/balsa-2.0.0_pre1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.0_pre1.ebuild,v 1.3 2002/06/02 22:31:40 stroke Exp $
-
-MY_V="2.0.0"
-MY_P="${PN}-${MY_V}"
-DATE="2002.04.24"  # Get this from the download page
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Balsa: Technical Preview email client for GNOME"
-SRC_URI="http://balsa.gnome.org/${MY_P}.tar.bz2"
-HOMEPAGE="http://balsa.gnome.org"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="=dev-libs/glib-2.0*
-	=x11-libs/gtk+-2.0*
-	>=net-libs/libesmtp-0.8.11
-	app-text/scrollkeeper
-	app-text/pspell
-	>=gnome-base/libgnome-1.117.2
-	>=gnome-base/libgnomeui-1.117.2
-	>=gnome-base/gnome-vfs-1.9.16
-	>=gnome-extra/libgnomeprint-1.114.0
-	>=gnome-extra/libgnomeprintui-1.114.0
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	perl? ( >=dev-libs/libpcre-3.4 )
-	gtkhtml? ( >=gnome-extra/libgtkhtml-1.99.8 )"
-
-DEPEND="dev-util/pkgconfig
-	${RDEPEND}"
-
-	
-src_unpack() {
-	 unpack ${A}
-	# this patch is from Riccardo Persichetti
-	# (ricpersi@libero.it) to make balsa compile
-	patch -p0 < ${FILESDIR}/${MY_P}-gentoo.patch || die
-	
-        # This patch is from me, stroke (stroke@gentoo.org)
-        patch -p0 < ${FILESDIR}/${MY_P}-varmail.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-2.0.0_pre1-r1.ebuild b/net-mail/balsa/balsa-2.0.1-r1.ebuild
index 350ead8c0386..c8d3f08f0576 100644
--- a/net-mail/balsa/balsa-2.0.0_pre1-r1.ebuild
+++ b/net-mail/balsa/balsa-2.0.1-r1.ebuild
@@ -1,29 +1,27 @@
 # 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.0_pre1-r1.ebuild,v 1.1 2002/06/10 00:32:22 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.1-r1.ebuild,v 1.1 2002/07/02 01:55:07 stroke Exp $
 
-MY_V="2.0.0"
-MY_P="${PN}-${MY_V}"
-DATE="2002.04.24"  # Get this from the download page
+inherit debug 
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P}
 
 DESCRIPTION="Balsa: Technical Preview email client for GNOME"
-SRC_URI="http://balsa.gnome.org/${MY_P}.tar.bz2"
+SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
 HOMEPAGE="http://balsa.gnome.org"
 SLOT="0"
 LICENSE="GPL-2"
 
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.3
+RDEPEND=">=dev-libs/glib-2.0.4
+	>=x11-libs/gtk+-2.0.5
 	>=net-libs/libesmtp-0.8.11
 	app-text/scrollkeeper
 	app-text/pspell
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/gnome-vfs-1.9.17
-	>=gnome-base/libgnomeprint-1.114.0
-	>=gnome-base/libgnomeprintui-1.114.0
+	>=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 )
@@ -34,13 +32,23 @@ DEPEND="dev-util/pkgconfig
 
 	
 src_unpack() {
-	 unpack ${A}
+	unpack ${A}
 	# this patch is from Riccardo Persichetti
 	# (ricpersi@libero.it) to make balsa compile
-	patch -p0 < ${FILESDIR}/${MY_P}-gentoo.patch || die
-	
-        # This patch is from me, stroke (stroke@gentoo.org)
-        patch -p0 < ${FILESDIR}/${MY_P}-varmail.patch || die
+	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() {
@@ -52,7 +60,7 @@ src_compile() {
 # 	use spell && myconf="${myconf} --enable-all"
 
 	libmutt/configure --prefix=/usr \
-		--host=${CHOST} \
+	        --host=${CHOST} \
 		--with-mailpath=/var/mail || die "configure libmutt failed"
 
 	myconf="${myconf} --enable-threads"
diff --git a/net-mail/balsa/files/balsa-2.0.1-varmail.patch b/net-mail/balsa/files/balsa-2.0.1-varmail.patch
deleted file mode 100644
index f0d02bc88cf5..000000000000
--- a/net-mail/balsa/files/balsa-2.0.1-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.1.orig/libmutt/configure	2002-06-03 00:15:54.000000000 +0200
-+++ balsa-2.0.1/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/digest-balsa-2.0.0_pre1 b/net-mail/balsa/files/digest-balsa-2.0.0_pre1
deleted file mode 100644
index f33d59ef8635..000000000000
--- a/net-mail/balsa/files/digest-balsa-2.0.0_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dde603b4a12fb9232d62361775b30d71 balsa-2.0.0.tar.bz2 2089825
diff --git a/net-mail/balsa/files/digest-balsa-2.0.0_pre1-r1 b/net-mail/balsa/files/digest-balsa-2.0.0_pre1-r1
deleted file mode 100644
index f33d59ef8635..000000000000
--- a/net-mail/balsa/files/digest-balsa-2.0.0_pre1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dde603b4a12fb9232d62361775b30d71 balsa-2.0.0.tar.bz2 2089825
diff --git a/net-mail/balsa/files/digest-balsa-2.0.1-r1 b/net-mail/balsa/files/digest-balsa-2.0.1-r1
new file mode 100644
index 000000000000..0526b3e46bee
--- /dev/null
+++ b/net-mail/balsa/files/digest-balsa-2.0.1-r1
@@ -0,0 +1 @@
+MD5 30f867b45b202a34e161f61ced8be73b balsa-2.0.1.tar.bz2 2117754