Updated deps in ebuild and reworked some parts. Ebuild now applies a deprecation patch.

Package-Manager: portage-2.0.51.19

4 files changed, 130 insertions, 20 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index b40838b4ebad..d014eec9e868 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/balsa
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.20 2005/03/27 15:24:20 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.21 2005/03/29 23:25:33 allanonjl Exp $
+
+  29 Mar 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/balsa-2.2.6-deprecation.fix.patch, balsa-2.2.6.ebuild:
+  Updated deps in ebuild and reworked some parts. Ebuild now applies a
+  deprecation patch.
 
   27 Mar 2005; John N. Laliberte <allanonjl@gentoo.org> balsa-2.2.6.ebuild:
   Typo on the gmime dep.
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index b122041b095d..798a87ef2fa7 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,11 +1,12 @@
 MD5 3d8ea268bc011e284d19acc46e831802 balsa-2.0.15-r2.ebuild 1804
-MD5 84f86a6af7a86e94275343eb9d26b9a2 balsa-2.2.6.ebuild 1443
+MD5 82ed46f37061d24cae64c9273e8ead7f balsa-2.2.6.ebuild 1625
 MD5 d4f6dbc31e378077014bb877a6be7feb balsa-1.4.3.ebuild 1700
-MD5 b4afa5ab8f3d93cef66c26d5fc88e9cf ChangeLog 11519
+MD5 081bea06a4e971b6fdd1949fe02aa573 ChangeLog 11732
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
 MD5 6214786af3a3095a1e721302f10228f2 files/gtk+2.4-2.patch 1542
 MD5 7640c6a66bb87af1486164581e95296d files/balsa-1.4.0-gentoo.diff 830
 MD5 1a6b22403c4f66fbbbd6940c7cc31dca files/balsa-gtk+-2.4-deprecation-fix.patch 2848
 MD5 92455a1d3e62f5727b37d43f60acdf12 files/digest-balsa-1.4.3 65
 MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6 65
+MD5 cb6019030e00d143459011755f8f525f files/balsa-2.2.6-deprecation.fix.patch 3352
 MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r2 66
diff --git a/mail-client/balsa/balsa-2.2.6.ebuild b/mail-client/balsa/balsa-2.2.6.ebuild
index 71fcbe8b7077..6db31509c155 100644
--- a/mail-client/balsa/balsa-2.2.6.ebuild
+++ b/mail-client/balsa/balsa-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.2.6.ebuild,v 1.4 2005/03/27 15:24:20 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.2.6.ebuild,v 1.5 2005/03/29 23:25:33 allanonjl Exp $
 
 inherit gnome2 eutils
 
@@ -13,11 +13,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
 
-RDEPEND="net-mail/mailbase
-	>=gnome-base/libgnomeui-2
+RDEPEND=">=gnome-base/libgnome-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-vfs-2.0
+	=dev-libs/gmime-2.1.9*
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libgnomeprint-2.1.4
 	>=gnome-base/libgnomeprintui-2.1.4
+	>=x11-libs/gtk+-2
+	net-mail/mailbase
 	>=net-libs/libesmtp-1.0-r1
-	=dev-libs/gmime-2.1.9-r1
 	sys-devel/libtool
 	virtual/aspell-dict
 	ssl? ( dev-libs/openssl )
@@ -26,33 +31,36 @@ RDEPEND="net-mail/mailbase
 	ldap? ( net-nds/openldap )
 	kerberos? ( app-crypt/mit-krb5 )
 	sqlite? ( >=dev-db/sqlite-2.8 )
-	crypt? ( >=app-crypt/gpgme-0.9.0 )"
+	crypt? ( >=app-crypt/gpgme-0.9.0 )
+	"
 
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
-	app-text/scrollkeeper
+	>=app-text/scrollkeeper-0.1.4
 	doc? ( dev-util/gtk-doc )
 	"
 
 USE_DESTDIR="1"
 
-src_compile() {
-	local myconf
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/balsa-2.2.6-deprecation.fix.patch
+}
 
-	use crypt && myconf="${myconf} --with-gpgme=gpgme-config"
+use crypt \
+	&& G2CONF="${G2CONF} --with-gpgme=gpgme-config" \
+	|| G2CONF="${G2CONF} --without-gpgme"
 
-	econf \
+G2CONF="${G2CONF} \
 		$(use_with ssl) \
 		$(use_with ldap) \
 		$(use_with sqlite) \
 		$(use_with kerberos gss) \
-		$(use_enable gtkhtml ) \
-		$(use_enable threads ) \
-		$(use_enable pcre ) \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
+		$(use_enable gtkhtml) \
+		$(use_enable threads) \
+		$(use_enable pcre) \
+		"
 
 DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
diff --git a/mail-client/balsa/files/balsa-2.2.6-deprecation.fix.patch b/mail-client/balsa/files/balsa-2.2.6-deprecation.fix.patch
new file mode 100644
index 000000000000..1d332d9769e4
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.2.6-deprecation.fix.patch
@@ -0,0 +1,96 @@
+--- balsa-2.2.6.orig/libbalsa/Makefile.am	2005-03-27 21:49:44.951892656 -0500
++++ balsa-2.2.6/libbalsa/Makefile.am	2005-03-27 21:52:24.558628744 -0500
+@@ -129,15 +129,7 @@
+ 	-I${top_srcdir}/libbalsa/imap \
+ 	$(BALSA_CFLAGS)
+ 
+-DEFS =                                   \
+-       -DG_DISABLE_DEPRECATED            \
+-       -DGDK_DISABLE_DEPRECATED          \
+-       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
+-       -DGNOME_DISABLE_DEPRECATED        \
+-       -DGNOME_DISABLE_DEPRECATED_SOURCE \
+-       -DGNOME_VFS_DISABLE_DEPRECATED    \
+-       -DGTK_DISABLE_DEPRECATED          \
+-       -DPANGO_DISABLE_DEPRECATED
++DEFS =
+ 
+ #Signal marshallers
+ marshal_prefix = libbalsa
+--- balsa-2.2.6.orig/libbalsa/Makefile.in	2005-03-27 21:49:44.951892656 -0500
++++ balsa-2.2.6/libbalsa/Makefile.in	2005-03-27 21:52:46.696263312 -0500
+@@ -156,15 +156,6 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+-DEFS = \
+-       -DG_DISABLE_DEPRECATED            \
+-       -DGDK_DISABLE_DEPRECATED          \
+-       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
+-       -DGNOME_DISABLE_DEPRECATED        \
+-       -DGNOME_DISABLE_DEPRECATED_SOURCE \
+-       -DGNOME_VFS_DISABLE_DEPRECATED    \
+-       -DGTK_DISABLE_DEPRECATED          \
+-       -DPANGO_DISABLE_DEPRECATED
+ 
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+--- balsa-2.2.6.orig/libinit_balsa/Makefile.am	2005-03-27 21:49:44.923896912 -0500
++++ balsa-2.2.6/libinit_balsa/Makefile.am	2005-03-27 21:53:13.864133168 -0500
+@@ -23,6 +23,4 @@
+ 	-I$(top_srcdir)/src \
+         $(BALSA_CFLAGS)
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
++DEFS =
+--- balsa-2.2.6.orig/libinit_balsa/Makefile.in	2005-03-27 21:49:44.924896760 -0500
++++ balsa-2.2.6/libinit_balsa/Makefile.in	2005-03-27 21:53:43.276661784 -0500
+@@ -108,9 +108,6 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+ 
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+--- balsa-2.2.6.orig/src/Makefile.am	2005-03-27 21:49:44.886902536 -0500
++++ balsa-2.2.6/src/Makefile.am	2005-03-27 21:54:10.076587576 -0500
+@@ -82,15 +82,7 @@
+ 	-I$(top_srcdir)/libbalsa \
+ 	$(BALSA_CFLAGS)
+ 
+-DEFS =                                   \
+-       -DG_DISABLE_DEPRECATED            \
+-       -DGDK_DISABLE_DEPRECATED          \
+-       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
+-       -DGNOME_DISABLE_DEPRECATED        \
+-       -DGNOME_DISABLE_DEPRECATED_SOURCE \
+-       -DGNOME_VFS_DISABLE_DEPRECATED    \
+-       -DGTK_DISABLE_DEPRECATED          \
+-       -DPANGO_DISABLE_DEPRECATED
++DEFS =
+ 
+ balsa_LDADD = \
+ 	$(top_builddir)/libinit_balsa/libinit_balsa.a \
+--- balsa-2.2.6.orig/src/Makefile.in	2005-03-27 21:49:44.887902384 -0500
++++ balsa-2.2.6/src/Makefile.in	2005-03-27 21:54:27.291970440 -0500
+@@ -137,15 +137,6 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+-DEFS = \
+-       -DG_DISABLE_DEPRECATED            \
+-       -DGDK_DISABLE_DEPRECATED          \
+-       -DGDK_PIXBUF_DISABLE_DEPRECATED   \
+-       -DGNOME_DISABLE_DEPRECATED        \
+-       -DGNOME_DISABLE_DEPRECATED_SOURCE \
+-       -DGNOME_VFS_DISABLE_DEPRECATED    \
+-       -DGTK_DISABLE_DEPRECATED          \
+-       -DPANGO_DISABLE_DEPRECATED
+ 
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@