4 files changed, 101 insertions, 10 deletions
diff --git a/net-mail/balsa/ChangeLog b/net-mail/balsa/ChangeLog
index f1ec548e245f..d53ad1d2868d 100644
--- a/net-mail/balsa/ChangeLog
+++ b/net-mail/balsa/ChangeLog
@@ -1,6 +1,9 @@
 # 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.46 2004/01/08 01:28:06 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.47 2004/04/11 04:02:39 khai Exp $
+
+  10 Apr 2004; <khai@gentoo.org> balsa-2.0.15-r1.ebuild:
+  First commit, patch to make balsa-2.0.15-r1 compile against gtk+-2.4
 
   07 Jan 2004; Jason Wever <weeve@gentoo.org> balsa-2.0.14.ebuild:
   Marked stable on sparc.
diff --git a/net-mail/balsa/Manifest b/net-mail/balsa/Manifest
index 2d79c4002b46..581955de88b9 100644
--- a/net-mail/balsa/Manifest
+++ b/net-mail/balsa/Manifest
@@ -1,13 +1,14 @@
-MD5 4bf192f58ae9eb0be52a19e8b79b14d0 ChangeLog 7831
-MD5 306baf1b7cdbf5f70da066752ebd44af balsa-1.4.3.ebuild 1715
 MD5 a679efb198ad87b68ac094b4d27716c3 balsa-2.0.10.ebuild 1722
+MD5 306baf1b7cdbf5f70da066752ebd44af balsa-1.4.3.ebuild 1715
 MD5 694d66321b4ec7cced8adfcdc2f8b080 balsa-2.0.11.ebuild 1648
+MD5 7a901a7c69ca6ec1c38f5f5084eb404a balsa-2.0.15-r1.ebuild 1540
 MD5 b6d44f542cefbefb475198b47ddf209a balsa-2.0.14.ebuild 1725
-MD5 14bfa8b592379a9507851f9d5a395ec0 balsa-2.0.15-r1.ebuild 1444
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7640c6a66bb87af1486164581e95296d files/balsa-1.4.0-gentoo.diff 830
-MD5 92455a1d3e62f5727b37d43f60acdf12 files/digest-balsa-1.4.3 65
+MD5 20f784c749084b5aa2b73a4f31a0e77f ChangeLog 7960
 MD5 74b12c84c9aefe5b1c457d6503a7040e files/digest-balsa-2.0.10 66
 MD5 2543b736a736635b03f9b7156b2a5071 files/digest-balsa-2.0.11 66
-MD5 2011fe7cfdc0ef2d21825be38169169f files/digest-balsa-2.0.14 66
 MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r1 66
+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 2011fe7cfdc0ef2d21825be38169169f files/digest-balsa-2.0.14 66
diff --git a/net-mail/balsa/balsa-2.0.15-r1.ebuild b/net-mail/balsa/balsa-2.0.15-r1.ebuild
index a729c70f3d1a..13662ca3446a 100644
--- a/net-mail/balsa/balsa-2.0.15-r1.ebuild
+++ b/net-mail/balsa/balsa-2.0.15-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.15-r1.ebuild,v 1.1 2003/11/25 15:33:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.15-r1.ebuild,v 1.2 2004/04/11 04:02:39 khai Exp $
 
 inherit gnome2 eutils
 
@@ -33,6 +33,12 @@ DEPEND="dev-util/pkgconfig
 	>=app-text/scrollkeeper-0.1.4
 	${RDEPEND}"
 
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/balsa-gtk+-2.4-deprecation-fix.patch
+}
 src_compile() {
 	local myconf
 
diff --git a/net-mail/balsa/files/balsa-gtk+-2.4-deprecation-fix.patch b/net-mail/balsa/files/balsa-gtk+-2.4-deprecation-fix.patch
new file mode 100644
index 000000000000..c6202892785b
--- /dev/null
+++ b/net-mail/balsa/files/balsa-gtk+-2.4-deprecation-fix.patch
@@ -0,0 +1,81 @@
+diff -ruN balsa-2.0.15.orig/libbalsa/Makefile.am balsa-2.0.15/libbalsa/Makefile.am
+--- balsa-2.0.15.orig/libbalsa/Makefile.am	2004-03-29 22:16:49.000000000 -0800
++++ balsa-2.0.15/libbalsa/Makefile.am	2004-03-29 22:46:32.166802264 -0800
+@@ -85,9 +85,6 @@
+ 	$(BALSA_CFLAGS)
+ 
+ DEFS = -DLIBMUTT                \
+-       -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+ 
+ #Signal marshallers
+ marshal_prefix = libbalsa
+diff -ruN balsa-2.0.15.orig/libbalsa/Makefile.in balsa-2.0.15/libbalsa/Makefile.in
+--- balsa-2.0.15.orig/libbalsa/Makefile.in	2004-03-29 22:16:49.000000000 -0800
++++ balsa-2.0.15/libbalsa/Makefile.in	2004-03-29 22:46:19.337752576 -0800
+@@ -211,11 +211,7 @@
+ 
+ 
+ DEFS = -DLIBMUTT                \
+-       -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+-
+-
++       
+ #Signal marshallers
+ marshal_prefix = libbalsa
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+diff -ruN balsa-2.0.15.orig/libinit_balsa/Makefile.am balsa-2.0.15/libinit_balsa/Makefile.am
+--- balsa-2.0.15.orig/libinit_balsa/Makefile.am	2004-03-29 22:16:49.000000000 -0800
++++ balsa-2.0.15/libinit_balsa/Makefile.am	2004-03-29 22:46:45.912712568 -0800
+@@ -22,6 +22,4 @@
+ 	-I$(top_srcdir)/src \
+         $(BALSA_CFLAGS)
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
++DEFS = 
+diff -ruN balsa-2.0.15.orig/libinit_balsa/Makefile.in balsa-2.0.15/libinit_balsa/Makefile.in
+--- balsa-2.0.15.orig/libinit_balsa/Makefile.in	2004-03-29 22:16:49.000000000 -0800
++++ balsa-2.0.15/libinit_balsa/Makefile.in	2004-03-29 22:35:52.123103696 -0800
+@@ -147,10 +147,6 @@
+         $(BALSA_CFLAGS)
+ 
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+-
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+diff -ruN balsa-2.0.15.orig/src/Makefile.am balsa-2.0.15/src/Makefile.am
+--- balsa-2.0.15.orig/src/Makefile.am	2004-03-29 22:16:49.000000000 -0800
++++ balsa-2.0.15/src/Makefile.am	2004-03-29 22:46:57.936884616 -0800
+@@ -105,6 +105,4 @@
+ $(CORBA_SRCLIST): $(idl_DATA)
+ 		$(ORBIT_IDL) $(idl_DATA)
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
++DEFS = 
+diff -ruN balsa-2.0.15.orig/src/Makefile.in balsa-2.0.15/src/Makefile.in
+--- balsa-2.0.15.orig/src/Makefile.in	2004-03-29 22:16:49.000000000 -0800
++++ balsa-2.0.15/src/Makefile.in	2004-03-29 22:35:15.024743504 -0800
+@@ -223,11 +223,7 @@
+ 
+ 
+ BALSA_ORB_SRCLIST = orbit-glue.c 
+-
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+-
++      
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =