From 061396b649ed9bb2abaa11dad3c13415fa060b17 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 8 Aug 2004 03:16:07 +0000 Subject: Depandancy changes as per bug #57193. Cleanout of old version. Version bump for new gpgme0.3.14-r1 (permission from foser) --- mail-client/balsa/ChangeLog | 12 +++- mail-client/balsa/Manifest | 26 +++++---- mail-client/balsa/balsa-1.4.3.ebuild | 64 --------------------- mail-client/balsa/balsa-2.0.11.ebuild | 67 ---------------------- mail-client/balsa/balsa-2.0.14.ebuild | 70 ----------------------- mail-client/balsa/balsa-2.0.15-r1.ebuild | 4 +- mail-client/balsa/balsa-2.0.15-r2.ebuild | 75 +++++++++++++++++++++++++ mail-client/balsa/files/balsa-1.4.0-gentoo.diff | 23 -------- mail-client/balsa/files/digest-balsa-1.4.3 | 1 - mail-client/balsa/files/digest-balsa-2.0.11 | 1 - mail-client/balsa/files/digest-balsa-2.0.14 | 1 - mail-client/balsa/files/digest-balsa-2.0.15-r2 | 1 + mail-client/balsa/files/gpgme3-autoconf.patch | 23 ++++++++ mail-client/balsa/files/gtk+2.4-2.patch | 46 --------------- mail-client/balsa/files/gtk+2.4.patch | 46 --------------- 15 files changed, 127 insertions(+), 333 deletions(-) delete mode 100644 mail-client/balsa/balsa-1.4.3.ebuild delete mode 100644 mail-client/balsa/balsa-2.0.11.ebuild delete mode 100644 mail-client/balsa/balsa-2.0.14.ebuild create mode 100644 mail-client/balsa/balsa-2.0.15-r2.ebuild delete mode 100644 mail-client/balsa/files/balsa-1.4.0-gentoo.diff delete mode 100644 mail-client/balsa/files/digest-balsa-1.4.3 delete mode 100644 mail-client/balsa/files/digest-balsa-2.0.11 delete mode 100644 mail-client/balsa/files/digest-balsa-2.0.14 create mode 100644 mail-client/balsa/files/digest-balsa-2.0.15-r2 create mode 100644 mail-client/balsa/files/gpgme3-autoconf.patch delete mode 100644 mail-client/balsa/files/gtk+2.4-2.patch delete mode 100644 mail-client/balsa/files/gtk+2.4.patch (limited to 'mail-client/balsa') diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog index acf6f207d116..bf1ace14afda 100644 --- a/mail-client/balsa/ChangeLog +++ b/mail-client/balsa/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for mail-client/balsa # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.4 2004/07/17 22:08:36 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.5 2004/08/08 03:16:07 dragonheart Exp $ + +*balsa-2.0.15-r2 (08 Aug 2004) + + 08 Aug 2004; Daniel Black + -files/balsa-1.4.0-gentoo.diff, +files/gpgme3-autoconf.patch, + -files/gtk+2.4-2.patch, -files/gtk+2.4.patch, -balsa-1.4.3.ebuild, + -balsa-2.0.11.ebuild, -balsa-2.0.14.ebuild, balsa-2.0.15-r1.ebuild, + +balsa-2.0.15-r2.ebuild: + Depandancy changes as per bug #57193. Cleanout of old version. Version bump + for new gpgme0.3.14-r1 (permission from foser 04 Jun 2004; Bryan Østergaard balsa-2.0.15-r1.ebuild: Stable on alpha. diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest index 08f28b7e2126..e537dc41191d 100644 --- a/mail-client/balsa/Manifest +++ b/mail-client/balsa/Manifest @@ -1,14 +1,18 @@ -MD5 07d9c49017e18b703db6d80c67cffc24 balsa-2.0.14.ebuild 1797 -MD5 41c5f4fff797b8336b677ad030a0a05f balsa-2.0.11.ebuild 1714 -MD5 c8300f6b0c16712f882503c0cbd19ba4 balsa-2.0.15-r1.ebuild 1534 -MD5 f73bc1ad50c729c5eb81311f6fb4d455 balsa-1.4.3.ebuild 1707 -MD5 616ed7ebc8a5e1b15e008d99d7520f2a ChangeLog 8770 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 0bdec56bc38204b7d4b86d70e34b0970 ChangeLog 9219 +MD5 5608d5a5c8f84100fcc73394d4366688 balsa-2.0.15-r2.ebuild 1771 +MD5 e65a8385c79d3d5d0aa012821c78106f balsa-2.0.15-r1.ebuild 1536 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 2543b736a736635b03f9b7156b2a5071 files/digest-balsa-2.0.11 66 -MD5 2011fe7cfdc0ef2d21825be38169169f files/digest-balsa-2.0.14 66 -MD5 6214786af3a3095a1e721302f10228f2 files/gtk+2.4-2.patch 1542 -MD5 7640c6a66bb87af1486164581e95296d files/balsa-1.4.0-gentoo.diff 830 +MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r2 66 MD5 1a6b22403c4f66fbbbd6940c7cc31dca files/balsa-gtk+-2.4-deprecation-fix.patch 2848 -MD5 92455a1d3e62f5727b37d43f60acdf12 files/digest-balsa-1.4.3 65 -MD5 ccc39dccf91f32e598e857379c5b64bc files/gtk+2.4.patch 1542 +MD5 5d55275ba82dd8897b2c793176485818 files/gpgme3-autoconf.patch 792 MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r1 66 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.4 (GNU/Linux) + +iD8DBQFBFZrtmdTrptrqvGERAufKAJ9n2vhYJ2aXXB4FTuBeFRkOar638gCfb6fw +ieQkIYbF0GE6AfjfQU0KRZU= +=1yPP +-----END PGP SIGNATURE----- diff --git a/mail-client/balsa/balsa-1.4.3.ebuild b/mail-client/balsa/balsa-1.4.3.ebuild deleted file mode 100644 index 9ff9144c1c11..000000000000 --- a/mail-client/balsa/balsa-1.4.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-1.4.3.ebuild,v 1.3 2004/07/14 16:15:08 agriffis Exp $ - -inherit eutils - -IUSE="ssl nls cups gtkhtml spell perl" - -DESCRIPTION="Balsa: email client for GNOME" -SRC_URI="http://www.theochem.kth.se/~pawsa/${PN}/${P}.tar.bz2" -HOMEPAGE="http://www.balsa.net" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ~ppc sparc" - -DEPEND="=dev-libs/glib-1.2* - =x11-libs/gtk+-1.2* - >=media-libs/imlib-1.9.10-r1 - >=gnome-base/gnome-libs-1.4.1.4 - >=gnome-base/ORBit-0.5.10-r1 - >=media-libs/gdk-pixbuf-0.13.0 - >=net-libs/libesmtp-0.8.11 - nls? ( sys-devel/gettext ) - ssl? ( dev-libs/openssl ) - cups? ( >=gnome-base/gnome-print-0.30 ) - perl? ( >=dev-libs/libpcre-3.4 ) - spell? ( virtual/aspell-dict ) - gtkhtml? ( >=gnome-extra/gtkhtml-0.16.1 )" - -src_unpack() { - unpack ${A} - - # Patch to use the new aspell instead of the old, crusty pspell modules - cd ${S} - epatch ${FILESDIR}/${PN}-1.4.0-gentoo.diff -} - -src_compile() { - local myconf - - use nls || myconf="${myconf} --disable-nls" - use ssl && myconf="${myconf} --with-ssl" - use gtkhtml && myconf="${myconf} --enable-gtkhtml" - use perl && myconf="${myconf} --enable-pcre" - use spell && myconf="${myconf} --with-aspell=yes" - - myconf="${myconf} --with-mailpath=/var/mail --enable-threads" - - autoconf || die - 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/mail-client/balsa/balsa-2.0.11.ebuild b/mail-client/balsa/balsa-2.0.11.ebuild deleted file mode 100644 index 971b6965e665..000000000000 --- a/mail-client/balsa/balsa-2.0.11.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.0.11.ebuild,v 1.2 2004/06/24 22:14:48 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 - >=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 - >=net-libs/libesmtp-0.8.11 - 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 - >=app-text/scrollkeeper-0.1.4 - ${RDEPEND}" - -src_unpack(){ - unpack ${A} - cd ${S} - epatch ${FILESDIR}/gtk+2.4.patch -} -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 - econf ${myconf} --disable-threads || die "configure balsa failed" - - emake || die "emake failed" -} - -DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*" diff --git a/mail-client/balsa/balsa-2.0.14.ebuild b/mail-client/balsa/balsa-2.0.14.ebuild deleted file mode 100644 index bc3a36030553..000000000000 --- a/mail-client/balsa/balsa-2.0.14.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.0.14.ebuild,v 1.2 2004/06/24 22:14:48 agriffis Exp $ - -inherit gnome2 eutils - -IUSE="ssl gtkhtml perl ldap crypt" -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 ~alpha" - -RDEPEND="net-mail/mailbase - >=dev-libs/glib-2 - >=x11-libs/gtk+-2 - >=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 - >=net-libs/libesmtp-0.8.11 - virtual/aspell-dict - >=app-text/scrollkeeper-0.1.4 - ssl? ( dev-libs/openssl ) - perl? ( >=dev-libs/libpcre-3.4 ) - gtkhtml? ( =gnome-extra/libgtkhtml-2* ) - ldap? ( net-nds/openldap ) - crypt? ( =app-crypt/gpgme-0.3.14* )" - -DEPEND="dev-util/pkgconfig - ${RDEPEND}" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/gtk+2.4-2.patch -} -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 - econf ${myconf} \ - `use_with crypt gpgme` \ - --disable-threads || die "configure balsa failed" - - emake || die "emake failed" -} - -DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*" diff --git a/mail-client/balsa/balsa-2.0.15-r1.ebuild b/mail-client/balsa/balsa-2.0.15-r1.ebuild index 2b9613844906..e6cd6b06d462 100644 --- a/mail-client/balsa/balsa-2.0.15-r1.ebuild +++ b/mail-client/balsa/balsa-2.0.15-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.0.15-r1.ebuild,v 1.3 2004/06/24 22:14:48 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.0.15-r1.ebuild,v 1.4 2004/08/08 03:16:07 dragonheart Exp $ inherit gnome2 eutils @@ -27,7 +27,7 @@ RDEPEND="net-mail/mailbase perl? ( >=dev-libs/libpcre-3.4 ) gtkhtml? ( =gnome-extra/libgtkhtml-2* ) ldap? ( net-nds/openldap ) - crypt? ( =app-crypt/gpgme-0.3.14* )" + crypt? ( =app-crypt/gpgme-0.3.14 )" DEPEND="dev-util/pkgconfig >=app-text/scrollkeeper-0.1.4 diff --git a/mail-client/balsa/balsa-2.0.15-r2.ebuild b/mail-client/balsa/balsa-2.0.15-r2.ebuild new file mode 100644 index 000000000000..557866d9b4b4 --- /dev/null +++ b/mail-client/balsa/balsa-2.0.15-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.0.15-r2.ebuild,v 1.1 2004/08/08 03:16:07 dragonheart Exp $ + +inherit gnome2 eutils + +IUSE="ssl gtkhtml perl ldap crypt" +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 ~alpha" + +RDEPEND="net-mail/mailbase + >=dev-libs/glib-2 + >=x11-libs/gtk+-2 + >=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 + >=net-libs/libesmtp-0.8.11 + virtual/aspell-dict + ssl? ( dev-libs/openssl ) + perl? ( >=dev-libs/libpcre-3.4 ) + gtkhtml? ( =gnome-extra/libgtkhtml-2* ) + ldap? ( net-nds/openldap ) + crypt? ( =app-crypt/gpgme-0.3.14-r1 ) + crypt? ( sys-devel/autoconf )" + +DEPEND="dev-util/pkgconfig + >=app-text/scrollkeeper-0.1.4 + >=sys-apps/sed-4 + ${RDEPEND}" + +src_unpack() +{ + unpack ${A} + cd ${S} + epatch ${FILESDIR}/balsa-gtk+-2.4-deprecation-fix.patch + + if use crypt; + then + epatch ${FILESDIR}/gpgme3-autoconf.patch + sed -i -e s:gpgme\.h:gpgme3.h: libbalsa/rfc3156.c \ + libbalsa/rfc3156.h src/main.c + fi +} + +src_compile() { + local myconf + + use crypt && autoconf + + libmutt/configure \ + --prefix=/usr \ + --host=${CHOST} \ + --with-mailpath=/var/mail || die "configure libmutt failed" + + + # threads diabled because of 17079 + econf \ + `use_with ssl` \ + `use_enable gtkhtml` \ + `use_enable perl pcre` \ + `use_with ldap` \ + `use_with crypt gpgme` \ + --disable-threads || die "configure balsa failed" + + emake || die "emake failed" +} + +DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*" diff --git a/mail-client/balsa/files/balsa-1.4.0-gentoo.diff b/mail-client/balsa/files/balsa-1.4.0-gentoo.diff deleted file mode 100644 index 2ec9a5276598..000000000000 --- a/mail-client/balsa/files/balsa-1.4.0-gentoo.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN balsa-1.4.0.old/configure.in balsa-1.4.0/configure.in ---- balsa-1.4.0.old/configure.in Mon Aug 19 11:04:50 2002 -+++ balsa-1.4.0/configure.in Tue Sep 10 06:19:57 2002 -@@ -49,9 +49,16 @@ - dnl this should come after `AC_PROG_CC' - GNOME_X_CHECKS - --AC_CHECK_LIB(pspell, new_pspell_manager,,[ -- AC_MSG_ERROR([*** libpspell(-devel) not found. Please check http://balsa.gnome.org/ for information on the required files.]) --], -lstdc++ -lpspell-modules) -+AC_ARG_WITH(aspell, -+ [ --with-aspell Turn on aspell ], -+ [case "${withval}" in -+ yes) LIBS="-lstdc++ -laspell" ; -+ aspell=true ;; -+ no) LIBS="-lstdc++" ; -+ aspell=false ;; -+ *) AC_MSG_ERROR(bad value ${withval} for --with-aspell) ;; -+ esac],[LIBS=""]) -+AM_CONDITIONAL(WITH_ASPELL, test, x$aspell = xtrue) - - dnl Reset - # LDFLAGS="$balsa_save_LDFLAGS" diff --git a/mail-client/balsa/files/digest-balsa-1.4.3 b/mail-client/balsa/files/digest-balsa-1.4.3 deleted file mode 100644 index ce117b498676..000000000000 --- a/mail-client/balsa/files/digest-balsa-1.4.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 26ac08c059d2aaa73bd76d21150a6d24 balsa-1.4.3.tar.bz2 2385240 diff --git a/mail-client/balsa/files/digest-balsa-2.0.11 b/mail-client/balsa/files/digest-balsa-2.0.11 deleted file mode 100644 index 29e3d2dbe3c0..000000000000 --- a/mail-client/balsa/files/digest-balsa-2.0.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 1c8ed538818e392e0d2271a3ef2ace84 balsa-2.0.11.tar.bz2 2633518 diff --git a/mail-client/balsa/files/digest-balsa-2.0.14 b/mail-client/balsa/files/digest-balsa-2.0.14 deleted file mode 100644 index c54b0da4f6be..000000000000 --- a/mail-client/balsa/files/digest-balsa-2.0.14 +++ /dev/null @@ -1 +0,0 @@ -MD5 91ec11aec9f100e3ad6c02bccae2da5d balsa-2.0.14.tar.bz2 2774405 diff --git a/mail-client/balsa/files/digest-balsa-2.0.15-r2 b/mail-client/balsa/files/digest-balsa-2.0.15-r2 new file mode 100644 index 000000000000..3060884c07a9 --- /dev/null +++ b/mail-client/balsa/files/digest-balsa-2.0.15-r2 @@ -0,0 +1 @@ +MD5 dc00a4bd622c4a0c5d6b7dca397d4371 balsa-2.0.15.tar.bz2 2786211 diff --git a/mail-client/balsa/files/gpgme3-autoconf.patch b/mail-client/balsa/files/gpgme3-autoconf.patch new file mode 100644 index 000000000000..b48b317a5d7d --- /dev/null +++ b/mail-client/balsa/files/gpgme3-autoconf.patch @@ -0,0 +1,23 @@ +--- configure.in.orig 2004-08-08 01:03:56.919735072 +0930 ++++ configure.in 2004-08-08 01:06:51.330220648 +0930 +@@ -102,7 +102,7 @@ + CFLAGS="$CFLAGS -I$have_gpgme/include" + fi + AC_MSG_CHECKING([gpgme library version]) +- AC_TRY_RUN([#include ++ AC_TRY_RUN([#include + #include + int main() { + char gv[] = GPGME_VERSION; +@@ -115,9 +115,9 @@ + AC_DEFINE(HAVE_GPGME,1,[Defined when gpgme is available.]) + if test x"$have_gpgme" != xyes ; then + BALSA_CFLAGS="$BALSA_CFLAGS -I$have_gpgme/include" +- BALSA_LIBS="$BALSA_LIBS -L$have_gpgme/lib -lgpgme" ++ BALSA_LIBS="$BALSA_LIBS -L$have_gpgme/lib -lgpgme3" + else +- BALSA_LIBS="$BALSA_LIBS -lgpgme" ++ BALSA_LIBS="$BALSA_LIBS -lgpgme3" + fi + have_gpgme=yes + AC_PATH_PROG(gpg_path, gpg) diff --git a/mail-client/balsa/files/gtk+2.4-2.patch b/mail-client/balsa/files/gtk+2.4-2.patch deleted file mode 100644 index e4bf6b15f8c7..000000000000 --- a/mail-client/balsa/files/gtk+2.4-2.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/mail-client/balsa/files/gtk+2.4.patch b/mail-client/balsa/files/gtk+2.4.patch deleted file mode 100644 index 94e6f45f0afc..000000000000 --- a/mail-client/balsa/files/gtk+2.4.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 = -- cgit v1.2.3-65-gdbad