added the gtk+2.4 patch to older ebuilds

8 files changed, 118 insertions, 77 deletions

diff --git a/net-mail/balsa/ChangeLog b/net-mail/balsa/ChangeLog
index 2f12d2234946..b20a4563d1de 100644
--- a/net-mail/balsa/ChangeLog
+++ b/net-mail/balsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/balsa
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.48 2004/04/27 20:47:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/ChangeLog,v 1.49 2004/05/06 23:15:42 khai Exp $
+
+  06 May 2004; Yi Qiang <khai@gentoo.org> +files/gtk+2.4.patch,
+  -balsa-2.0.10.ebuild, balsa-2.0.11.ebuild, balsa-2.0.14.ebuild:
+  Fixed gtk+2.4 stuff for older ebuilds.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> balsa-1.4.3.ebuild:
   Add inherit eutils
diff --git a/net-mail/balsa/Manifest b/net-mail/balsa/Manifest
index bcc209e37da8..a6bd8d2bbf10 100644
--- a/net-mail/balsa/Manifest
+++ b/net-mail/balsa/Manifest
@@ -1,14 +1,14 @@
-MD5 9797303c66e0c55e94ebcec42802e148 ChangeLog 8055
 MD5 96e6676bddcb5e4366137c1664fa6223 balsa-1.4.3.ebuild 1731
-MD5 cca475716dd4f168fe49ca2041e7704c balsa-2.0.11.ebuild 1648
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 b6d44f542cefbefb475198b47ddf209a balsa-2.0.14.ebuild 1725
-MD5 75fecfda279ede91947841240ebc6d36 balsa-2.0.10.ebuild 1722
+MD5 e9d700d93bff1c0804b4bba5f462d958 balsa-2.0.11.ebuild 1716
 MD5 b94569234ad80088add15568ac43a92c balsa-2.0.15-r1.ebuild 1539
-MD5 7640c6a66bb87af1486164581e95296d files/balsa-1.4.0-gentoo.diff 830
-MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r1 66
+MD5 63aa92420b4a9f07781b9afd00baae59 balsa-2.0.14.ebuild 1799
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 9edaddfb5d438579f051f0146069e928 ChangeLog 8223
 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 ccc39dccf91f32e598e857379c5b64bc files/gtk+2.4.patch 1542
+MD5 6214786af3a3095a1e721302f10228f2 files/gtk+2.4-2.patch 1542
 MD5 92455a1d3e62f5727b37d43f60acdf12 files/digest-balsa-1.4.3 65
-MD5 74b12c84c9aefe5b1c457d6503a7040e files/digest-balsa-2.0.10 66
+MD5 2011fe7cfdc0ef2d21825be38169169f files/digest-balsa-2.0.14 66
diff --git a/net-mail/balsa/balsa-2.0.10.ebuild b/net-mail/balsa/balsa-2.0.10.ebuild
deleted file mode 100644
index 3883958feb12..000000000000
--- a/net-mail/balsa/balsa-2.0.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.10.ebuild,v 1.5 2004/04/27 20:47:41 agriffis Exp $
-
-inherit gnome2 eutils
-
-IUSE="ssl gtkhtml perl ldap"
-DESCRIPTION="Email client for GNOME"
-SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
-HOMEPAGE="http://balsa.gnome.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-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
-	virtual/aspell-dict
-	ssl? ( dev-libs/openssl )
-	perl? ( >=dev-libs/libpcre-3.4 )
-	gtkhtml? ( =gnome-extra/libgtkhtml-2* )
-	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"
-	use gtkhtml \
-		&& myconf="${myconf} --enable-gtkhtml" \
-		|| myconf="${myconf} --disable-gtkhtml"
-	use perl \
-		&& myconf="${myconf} --enable-pcre" \
-		|| myconf="${myconf} --disable-pcre"
-	use ldap \
-		&& myconf="${myconf} --enable-ldap" \
-		|| myconf="${myconf} --disable-ldap"
-
-	libmutt/configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		--with-mailpath=/var/mail || die "configure libmutt failed"
-
-	# threads diabled because of 17079
-	#myconf="${myconf} --enable-threads"
-	myconf="${myconf} --disable-threads"
-
-	econf ${myconf} || die "configure balsa failed"
-	emake || die "emake failed"
-}
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
diff --git a/net-mail/balsa/balsa-2.0.11.ebuild b/net-mail/balsa/balsa-2.0.11.ebuild
index b248d27151f1..ab42dc50c37e 100644
--- a/net-mail/balsa/balsa-2.0.11.ebuild
+++ b/net-mail/balsa/balsa-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # 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.11.ebuild,v 1.5 2004/04/27 20:47:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.11.ebuild,v 1.6 2004/05/06 23:15:42 khai Exp $
 
 inherit gnome2 eutils
 
@@ -32,6 +32,11 @@ DEPEND="dev-util/pkgconfig
 	>=app-text/scrollkeeper-0.1.4
 	${RDEPEND}"
 
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gtk+2.4.patch
+}
 src_compile() {
 	local myconf
 
diff --git a/net-mail/balsa/balsa-2.0.14.ebuild b/net-mail/balsa/balsa-2.0.14.ebuild
index 2ffe59613605..5439fe5ba142 100644
--- a/net-mail/balsa/balsa-2.0.14.ebuild
+++ b/net-mail/balsa/balsa-2.0.14.ebuild
@@ -1,6 +1,6 @@
 # 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.14.ebuild,v 1.4 2004/01/08 01:28:06 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-2.0.14.ebuild,v 1.5 2004/05/06 23:15:42 khai Exp $
 
 inherit gnome2 eutils
 
@@ -33,6 +33,11 @@ RDEPEND="net-mail/mailbase
 DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gtk+2.4-2.patch
+}
 src_compile() {
 	local myconf
 
diff --git a/net-mail/balsa/files/digest-balsa-2.0.10 b/net-mail/balsa/files/digest-balsa-2.0.10
deleted file mode 100644
index fa5256481918..000000000000
--- a/net-mail/balsa/files/digest-balsa-2.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4e5325df8b9ddbf62778094568a6814 balsa-2.0.10.tar.bz2 2574787
diff --git a/net-mail/balsa/files/gtk+2.4-2.patch b/net-mail/balsa/files/gtk+2.4-2.patch
new file mode 100644
index 000000000000..e4bf6b15f8c7
--- /dev/null
+++ b/net-mail/balsa/files/gtk+2.4-2.patch
@@ -0,0 +1,46 @@
+diff -ruN balsa-2.0.14.orig/libbalsa/Makefile.in balsa-2.0.14/libbalsa/Makefile.in
+--- balsa-2.0.14.orig/libbalsa/Makefile.in	2004-05-06 16:09:23.492107521 -0700
++++ balsa-2.0.14/libbalsa/Makefile.in	2004-05-06 16:09:44.495989137 -0700
+@@ -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.14.orig/libinit_balsa/Makefile.in balsa-2.0.14/libinit_balsa/Makefile.in
+--- balsa-2.0.14.orig/libinit_balsa/Makefile.in	2004-05-06 16:09:23.487108977 -0700
++++ balsa-2.0.14/libinit_balsa/Makefile.in	2004-05-06 16:09:59.925494607 -0700
+@@ -147,10 +147,7 @@
+         $(BALSA_CFLAGS)
+ 
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+-
++DEFS = 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+diff -ruN balsa-2.0.14.orig/src/Makefile.in balsa-2.0.14/src/Makefile.in
+--- balsa-2.0.14.orig/src/Makefile.in	2004-05-06 16:09:23.523098493 -0700
++++ balsa-2.0.14/src/Makefile.in	2004-05-06 16:10:10.754340250 -0700
+@@ -224,10 +224,7 @@
+ 
+ BALSA_ORB_SRCLIST = orbit-glue.c 
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+-
++DEFS = 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/net-mail/balsa/files/gtk+2.4.patch b/net-mail/balsa/files/gtk+2.4.patch
new file mode 100644
index 000000000000..94e6f45f0afc
--- /dev/null
+++ b/net-mail/balsa/files/gtk+2.4.patch
@@ -0,0 +1,46 @@
+diff -ruN balsa-2.0.11.orig/libbalsa/Makefile.in balsa-2.0.11/libbalsa/Makefile.in
+--- balsa-2.0.11.orig/libbalsa/Makefile.in	2004-05-06 15:43:57.050305474 -0700
++++ balsa-2.0.11/libbalsa/Makefile.in	2004-05-06 15:44:53.376879127 -0700
+@@ -210,11 +210,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.11.orig/libinit_balsa/Makefile.in balsa-2.0.11/libinit_balsa/Makefile.in
+--- balsa-2.0.11.orig/libinit_balsa/Makefile.in	2004-05-06 15:43:57.043307515 -0700
++++ balsa-2.0.11/libinit_balsa/Makefile.in	2004-05-06 15:45:06.391083960 -0700
+@@ -146,10 +146,7 @@
+         $(BALSA_CFLAGS)
+ 
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+-
++DEFS = 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+diff -ruN balsa-2.0.11.orig/src/Makefile.in balsa-2.0.11/src/Makefile.in
+--- balsa-2.0.11.orig/src/Makefile.in	2004-05-06 15:43:57.080296727 -0700
++++ balsa-2.0.11/src/Makefile.in	2004-05-06 15:44:37.439526797 -0700
+@@ -223,10 +223,7 @@
+ 
+ BALSA_ORB_SRCLIST = orbit-glue.c 
+ 
+-DEFS = -DG_DISABLE_DEPRECATED   \
+-       -DGTK_DISABLE_DEPRECATED \
+-       -DGNOME_DISABLE_DEPRECATED
+-
++DEFS = 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =