summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail-client/evolution/ChangeLog444
-rw-r--r--mail-client/evolution/Manifest14
-rw-r--r--mail-client/evolution/evolution-1.2.4.ebuild237
-rw-r--r--mail-client/evolution/evolution-1.4.5.ebuild194
-rw-r--r--mail-client/evolution/evolution-1.4.6.ebuild187
-rw-r--r--mail-client/evolution/files/digest-evolution-1.2.416
-rw-r--r--mail-client/evolution/files/digest-evolution-1.4.52
-rw-r--r--mail-client/evolution/files/digest-evolution-1.4.62
-rw-r--r--mail-client/evolution/files/evolution-1.1.90-kde.patch23
-rw-r--r--mail-client/evolution/files/evolution-1.1.90-sharedldap.patch11
-rw-r--r--mail-client/evolution/files/evolution-1.1.90-subversion.patch11
-rw-r--r--mail-client/evolution/files/evolution-1.4.4-alpha.patch51
-rw-r--r--mail-client/evolution/files/evolution-1.4.5-gtk-2.4.patch608
-rw-r--r--mail-client/evolution/files/evolution-1.4.5-nztimezone.patch53
-rw-r--r--mail-client/evolution/metadata.xml6
15 files changed, 1859 insertions, 0 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
new file mode 100644
index 000000000000..5bd27f060951
--- /dev/null
+++ b/mail-client/evolution/ChangeLog
@@ -0,0 +1,444 @@
+# ChangeLog for net-mail/evolution
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.1 2004/05/30 02:43:48 seemant Exp $
+
+*evolution-1.4.5 (29 May 2004)
+
+ 29 May 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
+ +files/evolution-1.1.90-kde.patch, +files/evolution-1.1.90-sharedldap.patch,
+ +files/evolution-1.1.90-subversion.patch,
+ +files/evolution-1.4.4-alpha.patch, +files/evolution-1.4.5-gtk-2.4.patch,
+ +files/evolution-1.4.5-nztimezone.patch, +evolution-1.2.4.ebuild,
+ +evolution-1.4.5.ebuild, +evolution-1.4.6.ebuild:
+ Moved from net-mail/evolution to mail-client/evolution.
+
+ 26 May 2004; Guy Martin <gmsoft@gentoo.org> evolution-1.4.6.ebuild:
+ Marked stable on hppa.
+
+ 14 May 2004; Lars Weiler <pylon@gentoo.org> evolution-1.4.6.ebuild:
+ Stable on ppc
+
+ 29 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> evolution-1.4.6.ebuild:
+ Stable on sparc in preparation for gtk 2.4
+
+ 28 Apr 2004; foser <foser@gentoo.org> evolution-1.4.5.ebuild :
+ Add gtk-2.4 build patch, provided by gmsoft in #49265
+
+ 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> evolution-1.4.5.ebuild,
+ evolution-1.4.6.ebuild:
+ Add inherit eutils
+
+ 25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> evolution-1.2.3.ebuild,
+ evolution-1.2.4.ebuild:
+ don't use deprecated ? : use syntax
+
+ 24 Mar 2004; Jon Portnoy <avenj@gentoo.org> evolution-1.4.5.ebuild,
+ evolution-1.4.6.ebuild :
+ Fixed screwy AMD64 deps in 1.4.5 and modified both ebuilds to recognize
+ kerberos properly on AMD64.
+
+ 23 Mar 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.6.ebuild:
+ fix amd64 dep and also fix configure flag passing in src_compile for amd64
+
+*evolution-1.4.6 (22 Mar 2004)
+
+ 22 Mar 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.6.ebuild:
+ version bump
+
+ 07 Mar 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.5.ebuild:
+ reinstate gnome2_pkg_postinst
+
+ 18 Feb 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.5.ebuild,
+ files/evolution-1.4.5-nztimezone.patch:
+ add CVS backported patch to deal with NZDT (UTC+13) (#41817)
+
+ 07 Feb 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.3.ebuild,
+ evolution-1.4.4.ebuild, evolution-1.4.5.ebuild:
+ reorder eclass inherits to prevent kde overriding gnome2_src_install
+
+ 14 Jan 2004; Aron Griffis <agriffis@gentoo.org> evolution-1.4.5.ebuild:
+ stable on alpha
+
+ 14 Dec 2003; Lars Weiler <pylon@gentoo.org> evolution-1.4.5.ebuild:
+ Make stable on ppc
+
+ 13 Dec 2003; Brad House <brad_mssw@gentoo.org> evolution-1.4.5.ebuild:
+ mark stable on amd64
+
+ 11 Dec 2003; <agriffis@gentoo.org> evolution-1.4.5.ebuild,
+ files/evolution-1.4.4-alpha.patch:
+ Modify 64-bit patch according to response on evolution-patches mailing list.
+ Apply it regardless of ARCH because it is necessary for all 64-bit (and
+ doesn't hurt other arches). Mark stable on ia64
+
+ 28 Nov 2003; Jason Wever <weeve@gentoo.org> evolution-1.4.5.ebuild:
+ Marked stable on sparc, fixes bug #32744.
+
+ 22 Oct 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.3.ebuild,
+ evolution-1.2.4.ebuild, evolution-1.4.3.ebuild, evolution-1.4.4.ebuild,
+ evolution-1.4.5.ebuild:
+ add app-crypt/gnupg dep (#31719)
+
+ 12 Oct 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.5.ebuild:
+ updated ORBit dep to 2.8.2 to get around gnome-2.4 bugs (#29453)
+
+ 24 Sep 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.5.ebuild:
+ made inherit kde optional again. comment on why there's a replace flags.
+
+*evolution-1.4.5 (24 Sep 2003)
+
+ 24 Sep 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.4.ebuild:
+ version bump. should fix some gnome 2.4 problems. added protection against
+ over-optimisation with gcc-3.3.1.
+
+ 09 Sep 2003; Mike Gardiner <obz@gentoo.org> evolution-1.4.0.ebuild,
+ evolution-1.4.3.ebuild, evolution-1.4.4.ebuild:
+ Removed bonobo-activation dependency
+
+ 30 Aug 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.3.ebuild,
+ evolution-1.2.4.ebuild, evolution-1.4.0.ebuild, evolution-1.4.3.ebuild,
+ evolution-1.4.4.ebuild:
+ moved dev-libs/pilot-link to app-pda/pilot-link
+
+ 30 Aug 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.3.ebuild,
+ evolution-1.2.4.ebuild, evolution-1.4.0.ebuild, evolution-1.4.3.ebuild,
+ evolution-1.4.4.ebuild:
+ moving gnome-extra/gnome-pilot* to app-pda/gnome-pilot*
+
+ 29 Aug 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.4.ebuild:
+ added yelp dependency
+
+ 20 Aug 2003; Aron Griffis <agriffis@gentoo.org> evolution-1.4.4.ebuild:
+ Add ~alpha now that I think most of the 64-bit problems are patched
+
+ 19 Aug 2003; Aron Griffis <agriffis@gentoo.org> evolution-1.4.4.ebuild,
+ files/evolution-1.4.4-alpha.patch:
+ Add some alpha fixes --- not complete yet
+
+ 14 Aug 2003; Aron Griffis <agriffis@gentoo.org> evolution-1.4.4.ebuild:
+ Add ~alpha to KEYWORDS
+
+*evolution-1.4.4 (11 Aug 2003)
+
+ 11 Aug 2003; Martin Schlemmer <azarah@gentoo.org> evolution-1.4.4.ebuild:
+ New version.
+
+ 18 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.3.ebuild:
+ forced to bump 1.4.3 to stable because someone has put a imperfect 1.4.0 to
+ stable
+
+*evolution-1.4.3 (11 Jul 2003)
+
+ 05 Aug 2003; Guy Martin <gmsoft@gentoo.org> evolution-1.4.3.ebuild :
+ Added hppa to KEYWORDS. Added some flags for hppa to make it compile.
+
+ 11 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.3.ebuild:
+ replaced mozilla dependency with dev-libs/nss dev-libs/nspr (#23730). SSL
+ support is still provided by either nspr/nss or openssl, use the 'mozilla' USE
+ flag to select. by default, it will use nss/nspr as ximian also packages with
+ that as default (#24185). also removed 1.4.0 release hacks.
+
+ 09 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.92.ebuild,
+ evolution-1.4.0.ebuild:
+ dep clean
+
+ 07 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.0.ebuild:
+ add scrolllkeeper dep
+
+ 12 Jun 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.0.ebuild:
+ added fix for scrollkeeper_docs sandbox violations (#22600)
+
+ 10 Jun 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.0.ebuild:
+ removed debug, cleaned up src_install
+
+*evolution-1.4.0 (10 Jun 2003)
+
+ 10 Jun 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.3.ebuild,
+ evolution-1.2.4.ebuild, evolution-1.4.0.ebuild:
+ new evolution 1.4. ebuild revamped and moved back to SLOT 0.
+ You must uninstall any 1.3 versions before installing 1.4!
+ Also added 1.3 version fixes thanks to Stanislav Brabec <utx@gentoo.org>
+
+ 07 Jun 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild,
+ evolution-1.3.2.ebuild, evolution-1.3.3.ebuild, evolution-1.3.92.ebuild:
+ added sed-4 deps
+
+*evolution-1.3.92 (03 Jun 2003)
+
+ 03 Jun 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.92.ebuild:
+ version bump to evolution 1.4 rc1. this continues to be slotted 2 because we
+ find that it is still usable in parallel with evolution-1.2.
+
+ 27 May 2003; Jason Wever <weeve@gentoo.org> evolution-1.2.4.ebuild:
+ Added ~sparc to keywords.
+
+ 16 May 2003; Lars Weiler <pylon@gentoo.org> evolution-1.2.4.ebuild:
+ Set ppc in KEYWORDS
+
+*evolution-1.3.3 (07 May 2003)
+
+ 09 May 2003; foser <foser@gentoo.org> evolution-1.3.3 :
+ Add inherit debug, is a devel pack
+
+ 07 May 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild,
+ evolution-1.3.2.ebuild, evolution-1.3.3.ebuild:
+ version bump. also removed -ldb1 from mozilla nss cflags.
+
+ 29 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild:
+ bumped 1.2.4 to stable for x86
+
+*evolution-1.3.2 (21 Apr 2003)
+
+ 23 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.2.ebuild:
+ use gnome2_src_install for things scrollkeeper
+
+ 21 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.2.ebuild:
+ Second preview release from Ximian. Please read the below page carefully
+ before merging:
+ http://developer.ximian.com/projects/evolution/release_notes/1.3.2.html
+
+*evolution-1.2.4 (05 Apr 2003)
+
+ 06 Jul 2003; Guy Martin <gmsoft@gentoo.org> evolution-1.2.4.ebuild :
+ Added hppa to KEYWORDS.
+
+ 22 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild:
+ marked ~ppc
+
+ 07 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild,
+ evolution-1.3.1.ebuild:
+ remove kde link for non-kde users
+
+ 05 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild:
+ version bump
+
+*evolution-1.2.3 (21 Mar 2003)
+
+ 09 Apr 2003; Graham Forest <vladimir@gentoo.org> evolution-1.2.3.ebuild:
+ Downgraded to ~ppc, excessive dep problems
+
+ 21 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.3.ebuild:
+ version bump. fixes security advisory (#17856). marked as x86 stable.
+
+*evolution-1.3.1 (14 Mar 2003)
+
+ 21 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.1.ebuild:
+ move from gtkhtml to libgtkhtml
+
+ 19 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.1.ebuild:
+ sourcing evo from gnome.org rather than ximian.com
+
+ 19 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.1.ebuild:
+ Add massive warning about the danger of using evo-1.3.1
+
+ 14 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.1.ebuild:
+ version bump to gtk2 _beta_ evolution. this version can co-exist with
+ evolution 1.2.x, but you must NOT run them at the same time. currently masked
+ because not everyone wants to break their mail clients ;)
+ Remember, this is an unstable release!
+
+ 17 Feb 2003; foser <foser@gentoo.org> evolution-1.[2.0-r1,0.8,2.1,2.2].ebuild :
+ Fixed db source uri (#15839)
+
+*evolution-1.2.2 (16 Feb 2003)
+
+ 09 Mar 2003; foser <foser@gentoo.org> evolution-1.2.2.ebuild :
+ Fixed glade dep
+
+ 03 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.2.ebuild :
+ marking as stable.
+
+ 02 Mar 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.2.ebuild :
+ USE="-mozilla" will actually remove mozilla from dependencies (#12821)
+
+ 16 Feb 2003; Daniel Robbins <drobbins@gentoo.org> evolution-1.2.2.ebuild:
+ added latest version ~masked for all arches previously in KEYWORDS. "It works
+ for me..." and your mileage may vary. Needs testing.
+
+ 08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> evolution-1.0.8-r2.ebuild, evolution-1.2.1.ebuild :
+ Mark 1.2.1 stable for x86. Do not install 1.0.8 if gnome-spell-0.5 or
+ gtkhtml-1.1 installed.
+
+ 10 Dec 2002; foser <foser@gentoo.org> evolution-1.0.7.ebuild evolution-1.0.8-r2.ebuild evolution-1.2.0.ebuild evolution-1.2.0-r1.ebuild :
+ Fixed gob deps (bug #11633)
+
+*evolution-1.2.1 (17 Dec 2002)
+
+ 17 Dec 2002; Stefan Jones <cretin@gentoo.org> :
+ New version, removed old patches and updated deps.
+
+*evolution-1.2.0-r1 (09 Dec 2002)
+
+ 09 Dec 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.2.0-r1.ebuild :
+ Add sharedldap.patch and settingscrash.patch from Mandrake to:
+ - Fix LDAP support (hopefully enable searching, but compiles fine).
+ - Fix a crash in settings if some variables not initialized.
+
+* Autoupdate keywords (12-6-02)
+ 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+ 02 Dec 2002; foser <foser@gentoo.org> evolution-1.2.0.ebuild :
+ Updated pda deps (bug #10307)
+
+ 29 Nov 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.2.0.ebuild :
+ Update DEPEND to include the required versions needed.
+
+*evolution-1.2.0 (16 Nov 2002)
+
+ 16 Nov 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.2.0.ebuild :
+ Update version.
+
+ 10 Nov 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.1.90.ebuild :
+ Update some USE flags. Add patches from Mandrake. Add utf8 patch. Fix
+ screwup with enabling NSS support.
+
+*evolution-1.1.90 (9 Nov 2002)
+
+ 9 Nov 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.1.90.ebuild :
+ Added RC1.
+
+*evolution-1.0.8-r2 (16 Oct 2002)
+
+ 16 Oct 2002; foser <foser@gentoo.org> evolution-1.0.8-r2.ebuild :
+ Added a patch which fixes bug #5373
+
+*evolution-1.0.8-r1 (20 Jul 2002)
+
+ 28 Aug 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.0.8-r1.ebuild :
+ Add scrollkeeper to DEPEND.
+
+ 20 Aug 2002; Mark Guertin <gerk@gentoo.org> evolution-1.0.8-r1.ebuild :
+ Put scrollkepper within doc?() in DEPEND to prevent it from trying to pull
+ All the doc stuff, even with USE="-doc" (also a nasty bug in docbook-sgml-utils
+ is stopping people from using because of this)
+
+ 20 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+ Fix $D being hardcoded into the binary in some cases (ccache ??).
+
+*evolution-1.0.8 (17 Jul 2002)
+
+ 17 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> evolution-1.0.8.ebuild:
+
+ New version and updated dependencies.
+
+
+*evolution-1.0.7 (15 Jun 2002)
+
+ 15 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> evolution-1.0.7.ebuild:
+
+ New version
+
+*evolution-1.0.5-r3 (12 Jun 2002)
+
+ 12 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> evolution-1.0.5-r3.ebuild :
+
+ Updated dep to the new gtkhtml revision. Bug #3659 related.
+
+
+*evolution-1.0.5-r2 (09 Jun 2002)
+
+ 09 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+ Use the new "elibtoolize" function from libtool.eclass. Hopefully this
+ will fix the pda and libtoolize problems.
+
+*evolution-1.0.5-r1 (09 Jun 2002)
+
+ 09 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> evolution-1.0.5-1.ebuild :
+
+ Updated dependencies. Changed deps to work even if gnome2 is unmasked.
+ Also this should Close/Fixe bug #3444
+
+*evolution-1.0.5 (13 May 2002)
+
+ 13 May 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.0.5.ebuild :
+
+ Updated version.
+
+*evolution-1.0.3-r7 (03 May 2002)
+ 03 May 2002; Spider <spider@gentoo.org> evolution-1.0.3-r7.ebuild :
+ Adding an important security fix
+
+ as reported on the mailing list yesterday, Evolution 1.0.3 has a serious
+ bug that can make it eat all the memory on your system and then crash
+ when downloading certain messages with invalid headers.
+
+ 29 Apr 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.0.3-r6.ebuild :
+
+ Replaced the "perl" use flag with "doc".
+
+*evolution-1.0.3-r6 (23 Apr 2002)
+
+ 23 Apr 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.0.3-r6.ebuild :
+
+ Resolve bug #334. Note: libtoolize is run only if "pda" is not in USE.
+
+*evolution-1.0.3-r5 (22 Apr 2002)
+
+ 22 Apr 2002; Martin Schlemmer <azarah@gentoo.org> evolution-1.0.3-r6.ebuild :
+
+ Resolve bug #334.
+
+*evolution-1.0.3-r4 (13 Apr 2002)
+ 13 Apr 2002; Spider <spider@gentoo.org> evolution-1.0.3-r4.ebuild :
+ Adding a dependency on gob in a futile attempt to solve bug #1674
+
+
+*evolution-1.0.3-r3 (9 April 2002)
+
+ 09 Apr 2002; M.Schlemmer <azarah@gentoo.org> evolution-1.0.3-r3.ebuild :
+
+ Update to use the virtualx eclass for enabling build in console.
+
+ 03 Apr 2002; M.Schlemmer <azarah@gentoo.org> evolution-1.0.3-r2.ebuild :
+
+ Add 'spell' DEPEND.
+
+*evolution-1.0.3-r2 (2 April 2002)
+
+ 02 Apr 2002; Seemant Kulleen <seemant@gentoo.org> evolution-1.0.3-r2.ebuild :
+
+ Trying Mandrake's fix to avoid having to compile it in X. Masked for now.
+
+*evolution-1.0.3-r1 (2 April 2002)
+
+ 02 Apr 2002; M.Schlemmer <azarah@gentoo.org> evolution-1.0.3-r1.ebuild :
+
+ Finally fix the filter crash bug, resolving bug #886. Resolve bug 1355, which
+ is the imap literal sting issue. Add ftp.gnome.org back into SRC_URI ... it is
+ in the stable branch now ...
+
+*evolution-1.0.3 (29 Mar 2002)
+
+ 29 Mar 2002; Spider <spider@gentoo.org> evolution-1.0.3.ebuild :
+
+ Update to latest evolution, keep 2 patches
+ Add optional perl dependency in order to use gtk-doc
+
+ 29 Mar 2002; Bruce A. Locke <blocke@shivan.org> evolution-1.0.3.ebuild :
+
+ Removed an invalid mirror from the SRC_URI.
+
+
+*evolution-1.0.2-r1 (21 Mar 2002)
+
+ 21 Mar 2002; G. Goodyear <g2boojum@gentoo.org> :
+
+ Added Mandrake patches. Hey, they're commented for a change.
+ Doesn't seem to fix the eaddress-conduit instantiation problem, though.
+
+*evolution-1.0.1-r2 (1 Feb 2002)
+
+ 4 Feb 2002; G. Goodyear <g2boojum@gentoo.org> ChangeLog :
+
+ I added back in an evo-1.0 ebuild. Annoyingly, the address conduit
+ crashes in 1.0.1 and 1.0.2, so Palm users should emerge the 1.0
+ version for the time being.
+
+ 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+
+ Added initial ChangeLog which should be updated whenever the package is
+ updated in any way. This changelog is targetted to users. This means that the
+ comments should well explained and written in clean English. The details about
+ writing correct changelogs are explained in the skel.ChangeLog file which you
+ can find in the root directory of the portage repository.
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
new file mode 100644
index 000000000000..0c3b45b68cf3
--- /dev/null
+++ b/mail-client/evolution/Manifest
@@ -0,0 +1,14 @@
+MD5 aca50541100957cc2f8517964d7b5e19 ChangeLog 15982
+MD5 3bf8231d7fa901075989b9b16f0dab16 evolution-1.2.4.ebuild 6395
+MD5 1cd446c1a132c731a57d5796bfb08c17 evolution-1.4.5.ebuild 5803
+MD5 f2267d45ab6c42bff07e398f0489146f evolution-1.4.6.ebuild 5572
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
+MD5 49463c08f32ee1df0970196b6c4cef2b files/digest-evolution-1.4.5 132
+MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
+MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
+MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
+MD5 d863019d9fb9a8f74c5090de0f1ceee4 files/evolution-1.4.5-gtk-2.4.patch 26799
+MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
diff --git a/mail-client/evolution/evolution-1.2.4.ebuild b/mail-client/evolution/evolution-1.2.4.ebuild
new file mode 100644
index 000000000000..a6defdfbc55b
--- /dev/null
+++ b/mail-client/evolution/evolution-1.2.4.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.2.4.ebuild,v 1.1 2004/05/30 02:43:48 seemant Exp $
+
+IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos kde crypt"
+
+#provide Xmake and Xemake
+
+inherit eutils flag-o-matic gnome.org libtool virtualx
+
+DB3="db-3.1.17"
+S="${WORKDIR}/${P}"
+DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
+SRC_URI="ftp://ftp.ximian.com/pub/ximian-evolution/source/${P}.tar.gz
+ http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
+HOMEPAGE="http://www.ximian.com"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc ~sparc hppa"
+
+RDEPEND="app-text/scrollkeeper
+ >=gnome-extra/bonobo-conf-0.16
+ >=gnome-base/bonobo-1.0.21
+ >=gnome-base/gnome-common-1.2
+ =gnome-extra/gal-0.24*
+ =gnome-base/gconf-1.0*
+ >=gnome-extra/gtkhtml-1.1.10
+ >=gnome-base/oaf-0.6.10
+ >=gnome-base/ORBit-0.5.12
+ <gnome-base/libglade-2.0
+ >=media-libs/gdk-pixbuf-0.18.0
+ >=dev-libs/libxml-1.8.17
+ =gnome-base/gnome-vfs-1.0*
+ >=gnome-base/gnome-print-0.35
+ =dev-util/gob-1*
+ >=net-libs/soup-0.7.11
+ crypt? ( >=app-crypt/gnupg-1.2.2 )
+ doc? ( >=app-text/scrollkeeper-0.3.10-r1 )
+ ssl? (
+ mozilla? ( >=net-www/mozilla-0.9.9 )
+ !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
+ ldap? ( >=net-nds/openldap-2.0 )
+ pda? ( =app-pda/gnome-pilot-0.1*
+ >=app-pda/pilot-link-0.11.5 )
+ spell? ( <app-text/gnome-spell-1.0 )
+ kerberos? ( app-crypt/mit-krb5 )"
+
+# the pilot-link dep is normally covered by gnome-pilot, but evo
+# requires an higher version then gnome-pilot (bug #10307)
+
+# Added dependency on "dev-util/gob" this should fix a configure bug
+
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-1.4.1-r1
+ >=sys-apps/sed-4
+ doc? ( dev-util/gtk-doc )
+ nls? ( >=dev-util/intltool-0.20
+ sys-devel/gettext )"
+
+src_unpack() {
+ unpack ${A}
+
+ cd ${S};
+ # Mandrake patches
+ epatch ${FILESDIR}/${PN}-1.1.90-kde.patch
+ epatch ${FILESDIR}/${PN}-1.1.90-subversion.patch
+ epatch ${FILESDIR}/${PN}-1.1.90-sharedldap.patch
+
+ # libtoolize to fix not all libs installing, and buggy .la files.
+ # also add the gnome-pilot.m4 to the macros directory to fix
+ # problems with the pilot conduct
+ cd ${S}; cp -f ltmain.sh ${S}/libical/
+ elibtoolize --reverse-deps
+ aclocal -I macros -I /usr/share/aclocal/gnome-macros
+ autoconf
+ automake --add-missing
+
+ (cd libical ; aclocal -I /usr/share/aclocal/gnome-macros ; autoconf)
+
+ # Fix sandbox errors
+ cd ${S}/default_user
+ cp Makefile.in Makefile.in.orig
+ sed -e 's:-mkdir $(defaultdir:-mkdir $(DESTDIR)$(defaultdir:g' \
+ Makefile.in.orig > Makefile.in
+
+ # Remove unneeded db1 linking for nss/mozilla
+ cd ${S}; sed -i -e "s/-ldb1//" configure.in
+}
+
+src_compile() {
+
+ # *************************************************************
+ #
+ # DB3 compile...
+ #
+ # *************************************************************
+
+ # Rather ugly hack to make sure pthread mutex support are not enabled ...
+ cd ${WORKDIR}/${DB3}/dist
+# cp configure configure.orig
+# awk '!/MUTEX.*THREADS/ { sub("mut_pthread", "mut_fcntl"); print }' \
+# configure.orig > configure
+
+ einfo "Compiling DB3..."
+ cd ${WORKDIR}/${DB3}/build_unix
+ ../dist/configure --prefix=${WORKDIR}/db3 || die
+
+ if [ "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ]
+ then
+ append-flags "-pthread"
+ fi
+
+ make || die
+ make prefix=${WORKDIR}/db3 install || die
+
+ # *************************************************************
+ #
+ # Evolution compile...
+ #
+ # *************************************************************
+
+ einfo "Compiling Evolution..."
+ cd ${S}
+
+ local myconf=""
+ local MOZILLA="${MOZILLA_FIVE_HOME}"
+
+ if [ -n "`use pda`" ] ; then
+ myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
+ else
+ myconf="${myconf} --enable-pilot-conduits=no"
+ fi
+
+ if [ -n "`use ldap`" ] ; then
+ myconf="${myconf} --with-openldap=yes --with-static-ldap=no"
+ else
+ myconf="${myconf} --with-openldap=no"
+ fi
+
+ if [ -n "`use kerberos`" ]; then
+ myconf="${myconf} --with-krb5=/usr --with-krb4=/usr"
+ else
+ myconf="${myconf} --with-krb5=no --with-krb4=no"
+ fi
+
+ # Use Mozilla NSS libs if 'mozilla' *and* 'ssl' in USE
+ if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
+ myconf="${myconf} --enable-nss=yes \
+ --with-nspr-includes=${MOZILLA}/include/nspr \
+ --with-nspr-libs=${MOZILLA} \
+ --with-nss-includes=${MOZILLA}/include/nss \
+ --with-nss-libs=${MOZILLA}"
+ else
+ myconf="${myconf} --without-nspr-libs --without-nspr-includes \
+ --without-nss-libs --without-nss-includes"
+ fi
+
+ # Else use OpenSSL if 'mozilla' not in USE ...
+ if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
+ myconf="${myconf} --enable-openssl=yes"
+ fi
+
+ if [ -n "`use doc`" ] ; then
+ myconf="${myconf} --enable-gtk-doc"
+ else
+ myconf="${myconf} --disable-gtk-doc"
+ fi
+
+ if [ -n "`use ipv6`" ] ; then
+ myconf="${myconf} --enable-ipv6=yes"
+ else
+ myconf="${myconf} --enable-ipv6=no"
+ fi
+
+ if [ -z "`use nls`" ] ; then
+ myconf="${myconf} --disable-nls"
+ fi
+
+ CFLAGS="${CFLAGS} -I/usr/include/libpisock"
+ ./configure --host=${CHOST} \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --datadir=/usr/share \
+ --sysconfdir=/etc \
+ --localstatedir=/var/lib \
+ --with-db3=${WORKDIR}/db3 \
+ --disable-python-bindings \
+ ${myconf} || die
+
+ # fix xml-i18n-merge UTF-8 problems
+ export LANG="C"
+
+ #needs to be able to connect to X display to build.
+ Xemake || Xmake || die
+}
+
+src_install() {
+ cd omf-install
+ cp Makefile Makefile.old
+ sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
+ rm Makefile.old
+ cd ${S}
+
+ # Install with $DESTDIR, as in some rare cases $D gets hardcoded
+ # into the binaries (seems like a ccache problem at present),
+ # because everything is recompiled with the "new" PREFIX, if
+ # $DESTDIR is _not_ used.
+ make DESTDIR=${D} \
+ prefix=/usr \
+ mandir=/usr/share/man \
+ infodir=/usr/share/info \
+ datadir=/usr/share \
+ sysconfdir=/etc \
+ localstatedir=/var/lib \
+ KDE_APPLNK_DIR=/usr/share/applnk \
+ install || die
+
+ # remove kde link if USE="-kde"
+ if [ -z "`use kde`" ]; then
+ rm -rf ${D}/usr/share/applnk
+ fi
+
+ dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
+ dodoc NEWS README
+}
+
+pkg_postinst() {
+ echo ">>> Updating Scrollkeeper database..."
+ scrollkeeper-update >/dev/null 2>&1
+}
+
+pkg_postrm() {
+ echo ">>> Updating Scrollkeeper database..."
+ scrollkeeper-update >/dev/null 2>&1
+}
+
diff --git a/mail-client/evolution/evolution-1.4.5.ebuild b/mail-client/evolution/evolution-1.4.5.ebuild
new file mode 100644
index 000000000000..1ce8654a0773
--- /dev/null
+++ b/mail-client/evolution/evolution-1.4.5.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.5.ebuild,v 1.1 2004/05/30 02:43:48 seemant Exp $
+
+# kde before gnome2, otherwise kde_src_install will override gnome2_src_install
+use kde && inherit kde
+inherit flag-o-matic virtualx gnome2 eutils
+
+# problems with -O3 on gcc-3.3.1
+replace-flags -O3 -O2
+
+DB3="db-3.1.17"
+S="${WORKDIR}/${P}"
+DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
+SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
+HOMEPAGE="http://www.ximian.com"
+
+IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde crypt"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc hppa alpha amd64"
+
+# Top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.0.9
+ >=gnome-extra/gal-1.99.10
+ >=net-libs/libsoup-1.99.26
+ >=gnome-extra/yelp-2.2
+ pda? ( >=app-pda/gnome-pilot-2.0.10-r1
+ >=app-pda/pilot-link-0.11.8
+ >=app-pda/gnome-pilot-conduits-2.0.10-r1 )
+ spell? ( >=app-text/gnome-spell-1.0.5 )
+ >=gnome-base/ORBit2-2.8.2
+ >=gnome-base/libbonoboui-2.0
+ >=gnome-base/gnome-vfs-2.0
+ >=gnome-base/libgnomeui-2.0
+ >=gnome-base/libglade-2.0
+ >=gnome-base/libgnome-2.0
+ >=dev-libs/libxml2-2.5
+ >=gnome-base/gconf-2.0
+ >=gnome-base/libgnomecanvas-2.2.0.2
+ >=gnome-base/libgnomeprintui-2.2
+ >=gnome-base/libgnomeprint-2.2
+ crypt? ( >=app-crypt/gnupg-1.2.2 )
+ ssl? ( mozilla? ( || ( ( >=dev-libs/nspr-4.3 >=dev-libs/nss-3.8 )
+ net-www/mozilla
+ )
+ ) )
+ ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
+ ldap? ( >=net-nds/openldap-2.0 )
+ kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
+ doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
+
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ dev-util/pkgconfig
+ >=sys-devel/libtool-1.4.1-r1
+ >=dev-util/intltool-0.20
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+ if [ -x ${ROOT}/usr/bin/evolution-1.3 ]; then
+ eerror "Please un-merge the 1.3 Development Versions of Ximian Evolution."
+ eerror "You can do this by doing:"
+ eerror ""
+ eerror " emerge -C \"=net-mail/evolution-1.3*\""
+ eerror ""
+ die "unmerge evolution-1.3 before installing evolution-1.4"
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Remove dependency on libdb1.so (its deprecated)
+ cd ${S}; sed -i -e "s/-ldb1//" configure
+
+ # We need the omf fix, or else we get access violation
+ # errors related to sandbox
+ gnome2_omf_fix ${S}/help/C/Makefile.in
+
+ # Patch for 64-bit ... should be retired for 1.5 which contains
+ # the patch upstream
+ epatch ${FILESDIR}/evolution-1.4.4-alpha.patch
+ # Patch backported from CVS. Fixes NZDT (UTC+13) timezone on emails
+ # http://bugzilla.ximian.com/show_bug.cgi?id=49357
+ cd ${S}/camel; epatch ${FILESDIR}/${P}-nztimezone.patch
+
+ cd ${S}
+ # fix gtk+-2.4 build (#49265)
+ epatch ${FILESDIR}/${P}-gtk-2.4.patch
+
+}
+
+##### Compile evolution specific db3 for static linking #####
+src_compile_db3() {
+ einfo "Compiling DB3..."
+ cd ${WORKDIR}/${DB3}/build_unix
+ ../dist/configure --prefix=${WORKDIR}/db3 || die
+
+ # Rather ugly hack to make sure pthread mutex support are not enabled ...
+ if [ -n "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ]; then
+ append-flags "-pthread"
+ fi
+
+ make || die "db make failed"
+ make prefix=${WORKDIR}/db3 install || die "db install failed"
+
+}
+
+src_compile() {
+ elibtoolize
+
+ if [ "${ARCH}" = "hppa" ]; then
+ append-flags "-fPIC -ffunction-sections"
+ export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+ fi
+
+ # Compile evo specific version of db3
+ src_compile_db3
+
+ einfo "Compiling Evolution..."
+ cd ${S}
+
+ local myconf=
+
+ use pda \
+ && myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
+ || myconf="${myconf} --enable-pilot-conduits=no"
+
+ use ldap \
+ && myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
+ || myconf="${myconf} --with-openldap=no"
+
+ use kerberos \
+ && myconf="${myconf} --with-krb5=/usr" \
+ || myconf="${myconf} --without-krb5"
+
+ use doc \
+ && myconf="${myconf} --enable-gtk-doc" \
+ || myconf="${myconf} --disable-gtk-doc"
+
+ use ipv6 \
+ && myconf="${myconf} --enable-ipv6=yes" \
+ || myconf="${myconf} --enable-ipv6=no"
+
+ use kde && [ -n "${KDEDIR}" ] \
+ && myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
+
+ # Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
+ if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
+ if has_version "dev-libs/nspr"; then
+ NSS_LIB=/usr/lib
+ NSS_INC=/usr/include
+ elif has_version "net-www/mozilla"; then
+ NSS_LIB=/usr/lib/mozilla
+ NSS_INC=/usr/lib/mozilla/include
+ else
+ eerror "Neither net-www/mozilla nor dev-libs/nspr found."
+ die "unexpected error. unable to find nss/nspr"
+ fi
+
+ myconf="${myconf} --enable-nss=yes \
+ --with-nspr-includes=${NSS_INC}/nspr \
+ --with-nspr-libs=${NSS_LIB} \
+ --with-nss-includes=${NSS_INC}/nss \
+ --with-nss-libs=${NSS_LIB}"
+ else
+ myconf="${myconf} --without-nspr-libs --without-nspr-includes \
+ --without-nss-libs --without-nss-includes"
+ fi
+
+ # Else use OpenSSL if 'mozilla' not in USE ...
+ if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
+ myconf="${myconf} --enable-openssl=yes"
+ fi
+
+ econf --with-db3=${WORKDIR}/db3 ${myconf} || die
+
+ # Needs to be able to connect to X display to build.
+ Xemake || Xmake || die "make failed"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ einfo "To change the default browser if you are not using GNOME, do:"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+ einfo ""
+ einfo "Replace 'mozilla %s' with which ever browser you use."
+}
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild
new file mode 100644
index 000000000000..d8405492cda6
--- /dev/null
+++ b/mail-client/evolution/evolution-1.4.6.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.1 2004/05/30 02:43:48 seemant Exp $
+
+# kde before gnome2, otherwise kde_src_install will override gnome2_src_install
+use kde && inherit kde
+inherit flag-o-matic virtualx gnome2 eutils
+
+# problems with -O3 on gcc-3.3.1
+replace-flags -O3 -O2
+
+DB3="db-3.1.17"
+S="${WORKDIR}/${P}"
+DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
+SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
+HOMEPAGE="http://www.ximian.com"
+
+IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde crypt"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc hppa ~alpha ~amd64"
+
+# Top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.0.10
+ >=gnome-extra/gal-1.99.11
+ >=net-libs/libsoup-1.99.28
+ >=gnome-extra/yelp-2.2
+ pda? ( >=app-pda/gnome-pilot-2.0.10-r1
+ >=app-pda/pilot-link-0.11.8
+ >=app-pda/gnome-pilot-conduits-2.0.10-r1 )
+ spell? ( >=app-text/gnome-spell-1.0.5 )
+ >=gnome-base/ORBit2-2.8.2
+ >=gnome-base/libbonoboui-2.0
+ >=gnome-base/gnome-vfs-2.0
+ >=gnome-base/libgnomeui-2.0
+ >=gnome-base/libglade-2.0
+ >=gnome-base/libgnome-2.0
+ >=dev-libs/libxml2-2.5
+ >=gnome-base/gconf-2.0
+ >=gnome-base/libgnomecanvas-2.2.0.2
+ >=gnome-base/libgnomeprintui-2.2
+ >=gnome-base/libgnomeprint-2.2
+ crypt? ( >=app-crypt/gnupg-1.2.2 )
+ ssl? ( mozilla? ( || ( ( >=dev-libs/nspr-4.3 >=dev-libs/nss-3.8 )
+ net-www/mozilla
+ )
+ ) )
+ ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
+ ldap? ( >=net-nds/openldap-2.0 )
+ kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
+ doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
+
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ dev-util/pkgconfig
+ >=sys-devel/libtool-1.4.1-r1
+ >=dev-util/intltool-0.20
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+ if [ -x ${ROOT}/usr/bin/evolution-1.3 ]; then
+ eerror "Please un-merge the 1.3 Development Versions of Ximian Evolution."
+ eerror "You can do this by doing:"
+ eerror ""
+ eerror " emerge -C \"=net-mail/evolution-1.3*\""
+ eerror ""
+ die "unmerge evolution-1.3 before installing evolution-1.4"
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Remove dependency on libdb1.so (its deprecated)
+ cd ${S}; sed -i -e "s/-ldb1//" configure
+
+ # We need the omf fix, or else we get access violation
+ # errors related to sandbox
+ gnome2_omf_fix ${S}/help/C/Makefile.in
+
+ # Patch for 64-bit ... should be retired for 1.5 which contains
+ # the patch upstream
+ #epatch ${FILESDIR}/evolution-1.4.4-alpha.patch
+
+}
+
+##### Compile evolution specific db3 for static linking #####
+src_compile_db3() {
+ einfo "Compiling DB3..."
+ cd ${WORKDIR}/${DB3}/build_unix
+ ../dist/configure --prefix=${WORKDIR}/db3 || die
+
+ # Rather ugly hack to make sure pthread mutex support are not enabled ...
+ if [ -n "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ]; then
+ append-flags "-pthread"
+ fi
+
+ make || die "db make failed"
+ make prefix=${WORKDIR}/db3 install || die "db install failed"
+
+}
+
+src_compile() {
+ elibtoolize
+
+ if [ "${ARCH}" = "hppa" ]; then
+ append-flags "-fPIC -ffunction-sections"
+ export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+ fi
+
+ # Compile evo specific version of db3
+ src_compile_db3
+
+ einfo "Compiling Evolution..."
+ cd ${S}
+
+ local myconf=
+
+ use pda \
+ && myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
+ || myconf="${myconf} --enable-pilot-conduits=no"
+
+ use ldap \
+ && myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
+ || myconf="${myconf} --with-openldap=no"
+
+ [ `use kerberos` -a ! `use amd64` ] \
+ && myconf="${myconf} --with-krb5=/usr" \
+ || myconf="${myconf} --without-krb5"
+
+ use doc \
+ && myconf="${myconf} --enable-gtk-doc" \
+ || myconf="${myconf} --disable-gtk-doc"
+
+ use ipv6 \
+ && myconf="${myconf} --enable-ipv6=yes" \
+ || myconf="${myconf} --enable-ipv6=no"
+
+ use kde && [ -n "${KDEDIR}" ] \
+ && myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
+
+ # Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
+ if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
+ if has_version "dev-libs/nspr"; then
+ NSS_LIB=/usr/lib
+ NSS_INC=/usr/include
+ elif has_version "net-www/mozilla"; then
+ NSS_LIB=/usr/lib/mozilla
+ NSS_INC=/usr/lib/mozilla/include
+ else
+ eerror "Neither net-www/mozilla nor dev-libs/nspr found."
+ die "unexpected error. unable to find nss/nspr"
+ fi
+
+ myconf="${myconf} --enable-nss=yes \
+ --with-nspr-includes=${NSS_INC}/nspr \
+ --with-nspr-libs=${NSS_LIB} \
+ --with-nss-includes=${NSS_INC}/nss \
+ --with-nss-libs=${NSS_LIB}"
+ else
+ myconf="${myconf} --without-nspr-libs --without-nspr-includes \
+ --without-nss-libs --without-nss-includes"
+ fi
+
+ # Else use OpenSSL if 'mozilla' not in USE ...
+ if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
+ myconf="${myconf} --enable-openssl=yes"
+ fi
+
+ econf --with-db3=${WORKDIR}/db3 ${myconf} || die
+
+ # Needs to be able to connect to X display to build.
+ Xemake || Xmake || die "make failed"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ einfo "To change the default browser if you are not using GNOME, do:"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+ einfo ""
+ einfo "Replace 'mozilla %s' with which ever browser you use."
+}
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/mail-client/evolution/files/digest-evolution-1.2.4 b/mail-client/evolution/files/digest-evolution-1.2.4
new file mode 100644
index 000000000000..b3cec260c9c4
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-1.2.4
@@ -0,0 +1,16 @@
+MD5 dc3bc6e2c133bb380f48f50f4918052e /files/evolution-1.0.2-conduit.patch 308
+MD5 76b7ec4d297cc9e14fd0c348c8449b75 /files/evolution-1.0.2-imapfix.diff 2838
+MD5 53050cb008a2555b215f7401772cfede /files/evolution-1.0.2-kde.patch 656
+MD5 d6c7be2ddd045fb5d487416bd09f1c1b /files/evolution-1.0.3-filter-crash.patch 1202
+MD5 1a2892e6ac519f18f30f5e2aa6508174 /files/evolution-1.0.8-mark-read-crash.patch 2018
+MD5 ecec58337e9c9f9ffb1013c4860fd33c /files/evolution-1.0.8-scrollkeeper.patch 1492
+MD5 c837abd50d990dea46fcea32b8a1b001 /files/evolution-1.1.90-kde.patch 689
+MD5 d2dcad91e6ec97286468eb7d13ceac9b /files/evolution-1.1.90-scrollkeeper.patch 1365
+MD5 8909b7f2d3483d55036f21ca2780e4a3 /files/evolution-1.1.90-sharedldap.patch 370
+MD5 f44bc5e363c1f976a7a72676886b9d13 /files/evolution-1.1.90-subversion.patch 470
+MD5 63d02821e6de8e0129d954d406dc77ae /files/evolution-1.1.90-utf8.patch 726
+MD5 2526fb78fe27dc17b78566860285bff1 /files/evolution-1.2.0-settingscrash.patch 625
+MD5 980771bb5349699c8d8ecd6b6f035b50 /files/gnome-pilot.m4 6452
+MD5 eb3c88124e9daf30ee0f70e4e10ea53d /evolution-1.2.4.ebuild 6239
+MD5 2c525e0d0e570c96e4fb1fd95e46354c evolution-1.2.4.tar.gz 16673251
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/mail-client/evolution/files/digest-evolution-1.4.5 b/mail-client/evolution/files/digest-evolution-1.4.5
new file mode 100644
index 000000000000..9b6429c969e8
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-1.4.5
@@ -0,0 +1,2 @@
+MD5 f16a86d6eaa9d9683f215586fcdac374 evolution-1.4.5.tar.bz2 13641682
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/mail-client/evolution/files/digest-evolution-1.4.6 b/mail-client/evolution/files/digest-evolution-1.4.6
new file mode 100644
index 000000000000..bba598d859f0
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-1.4.6
@@ -0,0 +1,2 @@
+MD5 4138610c027177e6ffe92bdd565128a6 evolution-1.4.6.tar.bz2 13927597
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/mail-client/evolution/files/evolution-1.1.90-kde.patch b/mail-client/evolution/files/evolution-1.1.90-kde.patch
new file mode 100644
index 000000000000..af178f1210f5
--- /dev/null
+++ b/mail-client/evolution/files/evolution-1.1.90-kde.patch
@@ -0,0 +1,23 @@
+--- evolution-1.1.90/configure.in.kde 2002-11-07 13:07:41.000000000 +0100
++++ evolution-1.1.90/configure.in 2002-11-07 13:12:12.000000000 +0100
+@@ -1196,18 +1196,8 @@
+ if test -z "$with_kde_applnk_path"; then
+ with_kde_applnk_path="$prefix/share/applnk"
+ fi
+- if test -d "$with_kde_applnk_path" ; then
+- AC_DEFINE(HAVE_KDE_APPLNK)
+- KDE_APPLNK_DIR="$with_kde_applnk_path"
+- else
+- AC_PATH_PROG(KDECONFIG, kde-config)
+- if test -n "$KDECONFIG"; then
+- KDE_APPLNK_DIR=`$KDECONFIG --expandvars --install apps`
+- AC_DEFINE(HAVE_KDE_APPLNK)
+- else
+- KDE_APPLNK_DIR=""
+- fi
+- fi
++ AC_DEFINE(HAVE_KDE_APPLNK)
++ KDE_APPLNK_DIR="$with_kde_applnk_path"
+ else
+ KDE_APPLNK_DIR=""
+ fi
diff --git a/mail-client/evolution/files/evolution-1.1.90-sharedldap.patch b/mail-client/evolution/files/evolution-1.1.90-sharedldap.patch
new file mode 100644
index 000000000000..6784aa343848
--- /dev/null
+++ b/mail-client/evolution/files/evolution-1.1.90-sharedldap.patch
@@ -0,0 +1,11 @@
+--- evolution-1.1.90/acinclude.m4.orig 2002-09-04 22:28:05.000000000 +0200
++++ evolution-1.1.90/acinclude.m4 2002-11-07 14:03:12.000000000 +0100
+@@ -107,7 +107,7 @@
+
+ case $with_static_ldap in
+ no|"")
+- if test -f $with_openldap/lib/libldap.la; then
++ if test ! -f $with_openldap/lib/libldap.la; then
+ with_static_ldap=yes
+ else
+ with_static_ldap=no
diff --git a/mail-client/evolution/files/evolution-1.1.90-subversion.patch b/mail-client/evolution/files/evolution-1.1.90-subversion.patch
new file mode 100644
index 000000000000..83cb40fd71b0
--- /dev/null
+++ b/mail-client/evolution/files/evolution-1.1.90-subversion.patch
@@ -0,0 +1,11 @@
+--- evolution-1.1.90/mail/mail-ops.c.subversion 2002-09-24 19:45:37.000000000 +0200
++++ evolution-1.1.90/mail/mail-ops.c 2002-11-07 13:17:20.000000000 +0100
+@@ -467,7 +467,7 @@
+ int i;
+
+ camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer",
+- "Ximian Evolution " VERSION SUB_VERSION " " VERSION_COMMENT);
++ "Ximian Evolution " VERSION "-" SUB_VERSION " " VERSION_COMMENT);
+
+ camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
+
diff --git a/mail-client/evolution/files/evolution-1.4.4-alpha.patch b/mail-client/evolution/files/evolution-1.4.4-alpha.patch
new file mode 100644
index 000000000000..7fbf8f648b09
--- /dev/null
+++ b/mail-client/evolution/files/evolution-1.4.4-alpha.patch
@@ -0,0 +1,51 @@
+--- evolution-1.4.4/filter/rule-context.c 2003-06-12 13:04:20.000000000 -0400
++++ ../../evo-avg/filter/rule-context.c 2003-08-18 14:29:14.000000000 -0400
+@@ -209,7 +209,7 @@
+ }
+
+ void
+-rule_context_add_part_set(RuleContext *rc, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next)
++rule_context_add_part_set(RuleContext *rc, const char *setname, GType part_type, RCPartFunc append, RCNextPartFunc next)
+ {
+ struct _part_set_map *map;
+
+@@ -226,7 +226,7 @@
+ }
+
+ void
+-rule_context_add_rule_set(RuleContext *rc, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next)
++rule_context_add_rule_set(RuleContext *rc, const char *setname, GType rule_type, RCRuleFunc append, RCNextRuleFunc next)
+ {
+ struct _rule_set_map *map;
+
+--- evolution-1.4.4/filter/rule-context.h 2003-04-29 14:14:08.000000000 -0400
++++ ../../evo-avg/filter/rule-context.h 2003-08-18 14:28:04.000000000 -0400
+@@ -85,14 +85,14 @@
+
+ struct _part_set_map {
+ char *name;
+- int type;
++ GType type;
+ RCPartFunc append;
+ RCNextPartFunc next;
+ };
+
+ struct _rule_set_map {
+ char *name;
+- int type;
++ GType type;
+ RCRuleFunc append;
+ RCNextRuleFunc next;
+ };
+@@ -122,9 +122,9 @@
+ int rule_context_get_rank_rule (RuleContext *rc, FilterRule *rule, const char *source);
+
+ /* setup type for set parts */
+-void rule_context_add_part_set (RuleContext *rc, const char *setname, int part_type,
++void rule_context_add_part_set (RuleContext *rc, const char *setname, GType part_type,
+ RCPartFunc append, RCNextPartFunc next);
+-void rule_context_add_rule_set (RuleContext *rc, const char *setname, int rule_type,
++void rule_context_add_rule_set (RuleContext *rc, const char *setname, GType rule_type,
+ RCRuleFunc append, RCNextRuleFunc next);
+
+ /* uri's disappear/renamed externally */
diff --git a/mail-client/evolution/files/evolution-1.4.5-gtk-2.4.patch b/mail-client/evolution/files/evolution-1.4.5-gtk-2.4.patch
new file mode 100644
index 000000000000..034c466578a0
--- /dev/null
+++ b/mail-client/evolution/files/evolution-1.4.5-gtk-2.4.patch
@@ -0,0 +1,608 @@
+diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am evolution-1.4.5/addressbook/backend/ebook/Makefile.am
+--- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/ebook/Makefile.am 2004-04-28 13:14:03.000000000 +0000
+@@ -45,8 +45,6 @@
+ -I$(top_builddir)/addressbook/ename \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ privlib_LTLIBRARIES = libebook.la libebook-static.la
+diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in evolution-1.4.5/addressbook/backend/ebook/Makefile.in
+--- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/ebook/Makefile.in 2004-04-28 13:13:57.000000000 +0000
+@@ -263,8 +263,6 @@
+ -I$(top_builddir)/addressbook/ename \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am evolution-1.4.5/addressbook/backend/pas/Makefile.am
+--- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/pas/Makefile.am 2004-04-28 13:14:10.000000000 +0000
+@@ -23,8 +23,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ LDAP_SCHEMA = \
+diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in evolution-1.4.5/addressbook/backend/pas/Makefile.in
+--- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/pas/Makefile.in 2004-04-28 13:14:15.000000000 +0000
+@@ -239,8 +239,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.am evolution-1.4.5/addressbook/gui/component/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/component/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/Makefile.am 2004-04-28 13:16:39.000000000 +0000
+@@ -21,10 +21,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+ $(LDAP_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ component_LTLIBRARIES = libevolution-addressbook.la
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.in evolution-1.4.5/addressbook/gui/component/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/component/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/Makefile.in 2004-04-28 13:16:44.000000000 +0000
+@@ -241,10 +241,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+ $(LDAP_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am 2004-04-28 13:16:22.000000000 +0000
+@@ -43,10 +43,6 @@
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = libeselectnames.la
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in 2004-04-28 13:16:28.000000000 +0000
+@@ -258,10 +258,6 @@
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am 2004-04-28 13:16:07.000000000 +0000
+@@ -12,10 +12,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in 2004-04-28 13:16:01.000000000 +0000
+@@ -232,10 +232,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am 2004-04-28 13:15:40.000000000 +0000
+@@ -13,10 +13,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-list-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in 2004-04-28 13:15:34.000000000 +0000
+@@ -233,10 +233,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-list-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am evolution-1.4.5/addressbook/gui/merging/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/merging/Makefile.am 2004-04-28 13:15:19.000000000 +0000
+@@ -4,10 +4,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in evolution-1.4.5/addressbook/gui/merging/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/merging/Makefile.in 2004-04-28 13:15:13.000000000 +0000
+@@ -224,10 +224,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.am evolution-1.4.5/addressbook/gui/search/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/search/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/search/Makefile.am 2004-04-28 13:14:59.000000000 +0000
+@@ -13,10 +13,6 @@
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+ -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.in evolution-1.4.5/addressbook/gui/search/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/search/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/search/Makefile.in 2004-04-28 13:15:04.000000000 +0000
+@@ -233,10 +233,6 @@
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+ -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am evolution-1.4.5/addressbook/gui/widgets/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/widgets/Makefile.am 2004-04-28 13:14:41.000000000 +0000
+@@ -11,10 +11,6 @@
+ -I$(top_srcdir)/addressbook/gui/component \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ CORBA_COMPOSER_SOURCE_H = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in evolution-1.4.5/addressbook/gui/widgets/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/widgets/Makefile.in 2004-04-28 13:14:48.000000000 +0000
+@@ -231,10 +231,6 @@
+ -I$(top_srcdir)/addressbook/gui/component \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.am evolution-1.4.5/addressbook/tools/Makefile.am
+--- evolution-1.4.5.orig/addressbook/tools/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/tools/Makefile.am 2004-04-28 13:13:21.000000000 +0000
+@@ -13,7 +13,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+ evolution_addressbook_export_SOURCES = \
+diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.in evolution-1.4.5/addressbook/tools/Makefile.in
+--- evolution-1.4.5.orig/addressbook/tools/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/tools/Makefile.in 2004-04-28 13:13:25.000000000 +0000
+@@ -234,7 +234,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/camel/Makefile.am evolution-1.4.5/camel/Makefile.am
+--- evolution-1.4.5.orig/camel/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/Makefile.am 2004-04-28 13:12:56.000000000 +0000
+@@ -16,7 +16,6 @@
+ -DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
+- -DG_DISABLE_DEPRECATED \
+ $(CAMEL_CFLAGS)
+
+ libcamel_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/Makefile.in evolution-1.4.5/camel/Makefile.in
+--- evolution-1.4.5.orig/camel/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/Makefile.in 2004-04-28 13:12:50.000000000 +0000
+@@ -235,7 +235,6 @@
+ -DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
+- -DG_DISABLE_DEPRECATED \
+ $(CAMEL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.am evolution-1.4.5/camel/providers/imap/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/imap/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/imap/Makefile.am 2004-04-28 13:11:20.000000000 +0000
+@@ -14,8 +14,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-imap-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-imap-provider\"
+
+ libcamelimap_la_SOURCES = \
+ camel-imap-command.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.in evolution-1.4.5/camel/providers/imap/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/imap/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/imap/Makefile.in 2004-04-28 13:11:14.000000000 +0000
+@@ -233,8 +233,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-imap-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-imap-provider\"
+
+
+ libcamelimap_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.am evolution-1.4.5/camel/providers/local/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/local/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/local/Makefile.am 2004-04-28 13:10:32.000000000 +0000
+@@ -14,8 +14,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-local-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-local-provider\"
+
+ libcamellocal_la_SOURCES = \
+ camel-local-folder.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.in evolution-1.4.5/camel/providers/local/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/local/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/local/Makefile.in 2004-04-28 13:10:40.000000000 +0000
+@@ -233,8 +233,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-local-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-local-provider\"
+
+
+ libcamellocal_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.am evolution-1.4.5/camel/providers/nntp/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/nntp/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/nntp/Makefile.am 2004-04-28 13:10:55.000000000 +0000
+@@ -13,8 +13,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-nntp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-nntp-provider\"
+
+ libcamelnntp_la_SOURCES = \
+ camel-nntp-provider.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.in evolution-1.4.5/camel/providers/nntp/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/nntp/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/nntp/Makefile.in 2004-04-28 13:11:01.000000000 +0000
+@@ -232,8 +232,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-nntp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-nntp-provider\"
+
+
+ libcamelnntp_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.am evolution-1.4.5/camel/providers/pop3/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/pop3/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/pop3/Makefile.am 2004-04-28 13:12:30.000000000 +0000
+@@ -15,8 +15,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-pop3-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-pop3-provider\"
+
+ libcamelpop3_la_SOURCES = \
+ camel-pop3-engine.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.in evolution-1.4.5/camel/providers/pop3/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/pop3/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/pop3/Makefile.in 2004-04-28 13:12:37.000000000 +0000
+@@ -234,8 +234,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-pop3-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-pop3-provider\"
+
+
+ libcamelpop3_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am evolution-1.4.5/camel/providers/sendmail/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/sendmail/Makefile.am 2004-04-28 13:12:07.000000000 +0000
+@@ -14,8 +14,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-sendmail-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-sendmail-provider\"
+
+ libcamelsendmail_la_SOURCES = \
+ camel-sendmail-provider.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in evolution-1.4.5/camel/providers/sendmail/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/sendmail/Makefile.in 2004-04-28 13:11:57.000000000 +0000
+@@ -233,8 +233,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-sendmail-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-sendmail-provider\"
+
+
+ libcamelsendmail_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.am evolution-1.4.5/camel/providers/smtp/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/smtp/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/smtp/Makefile.am 2004-04-28 13:11:44.000000000 +0000
+@@ -18,8 +18,7 @@
+ $(NSPR_CFLAGS) \
+ $(NSS_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
+- -DG_LOG_DOMAIN=\"camel-smtp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-smtp-provider\"
+
+ libcamelsmtp_la_SOURCES = \
+ camel-smtp-provider.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.in evolution-1.4.5/camel/providers/smtp/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/smtp/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/smtp/Makefile.in 2004-04-28 13:11:37.000000000 +0000
+@@ -237,8 +237,7 @@
+ $(NSPR_CFLAGS) \
+ $(NSS_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
+- -DG_LOG_DOMAIN=\"camel-smtp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-smtp-provider\"
+
+
+ libcamelsmtp_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/composer/Makefile.am evolution-1.4.5/composer/Makefile.am
+--- evolution-1.4.5.orig/composer/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/composer/Makefile.am 2004-04-28 13:10:08.000000000 +0000
+@@ -54,8 +54,6 @@
+ -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
+ -DPREFIX=\"$(prefix)\" \
+ -DG_LOG_DOMAIN=\"composer\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(EVOLUTION_MAIL_CFLAGS)
+
+ libcomposer_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/composer/Makefile.in evolution-1.4.5/composer/Makefile.in
+--- evolution-1.4.5.orig/composer/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/composer/Makefile.in 2004-04-28 13:10:00.000000000 +0000
+@@ -266,8 +266,6 @@
+ -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
+ -DPREFIX=\"$(prefix)\" \
+ -DG_LOG_DOMAIN=\"composer\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(EVOLUTION_MAIL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/e-util/Makefile.am evolution-1.4.5/e-util/Makefile.am
+--- evolution-1.4.5.orig/e-util/Makefile.am 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/e-util/Makefile.am 2004-04-28 13:09:47.000000000 +0000
+@@ -9,8 +9,6 @@
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
+ -DG_LOG_DOMAIN=\"e-utils\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(DB3_CFLAGS) \
+ $(GNOME_PILOT_CFLAGS) \
+ $(E_UTIL_CFLAGS)
+diff -uNr evolution-1.4.5.orig/e-util/Makefile.in evolution-1.4.5/e-util/Makefile.in
+--- evolution-1.4.5.orig/e-util/Makefile.in 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/e-util/Makefile.in 2004-04-28 13:09:42.000000000 +0000
+@@ -229,8 +229,6 @@
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
+ -DG_LOG_DOMAIN=\"e-utils\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(DB3_CFLAGS) \
+ $(GNOME_PILOT_CFLAGS) \
+ $(E_UTIL_CFLAGS)
+diff -uNr evolution-1.4.5.orig/filter/Makefile.am evolution-1.4.5/filter/Makefile.am
+--- evolution-1.4.5.orig/filter/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/filter/Makefile.am 2004-04-28 13:09:28.000000000 +0000
+@@ -8,8 +8,6 @@
+ -I $(top_srcdir)/shell \
+ -DFILTER_GLADEDIR=\"$(gladedir)\" \
+ -DG_LOG_DOMAIN=\"filter\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(LIBFILTER_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/filter/Makefile.in evolution-1.4.5/filter/Makefile.in
+--- evolution-1.4.5.orig/filter/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/filter/Makefile.in 2004-04-28 13:09:23.000000000 +0000
+@@ -228,8 +228,6 @@
+ -I $(top_srcdir)/shell \
+ -DFILTER_GLADEDIR=\"$(gladedir)\" \
+ -DG_LOG_DOMAIN=\"filter\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(LIBFILTER_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/mail/Makefile.am evolution-1.4.5/mail/Makefile.am
+--- evolution-1.4.5.orig/mail/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/mail/Makefile.am 2004-04-28 13:08:59.000000000 +0000
+@@ -34,8 +34,6 @@
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"evolution-mail\"
+
+ component_LTLIBRARIES = libevolution-mail.la
+diff -uNr evolution-1.4.5.orig/mail/Makefile.in evolution-1.4.5/mail/Makefile.in
+--- evolution-1.4.5.orig/mail/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/mail/Makefile.in 2004-04-28 13:08:54.000000000 +0000
+@@ -254,8 +254,6 @@
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"evolution-mail\"
+
+
+diff -uNr evolution-1.4.5.orig/shell/Makefile.am evolution-1.4.5/shell/Makefile.am
+--- evolution-1.4.5.orig/shell/Makefile.am 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/shell/Makefile.am 2004-04-28 13:08:36.000000000 +0000
+@@ -1,8 +1,6 @@
+ SUBDIRS = glade importer
+
+ INCLUDES = \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+- -DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/libical/src/libical \
+diff -uNr evolution-1.4.5.orig/shell/Makefile.in evolution-1.4.5/shell/Makefile.in
+--- evolution-1.4.5.orig/shell/Makefile.in 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/shell/Makefile.in 2004-04-28 13:08:32.000000000 +0000
+@@ -221,8 +221,6 @@
+ SUBDIRS = glade importer
+
+ INCLUDES = \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+- -DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/libical/src/libical \
+diff -uNr evolution-1.4.5.orig/tools/Makefile.am evolution-1.4.5/tools/Makefile.am
+--- evolution-1.4.5.orig/tools/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/tools/Makefile.am 2004-04-28 13:08:11.000000000 +0000
+@@ -21,7 +21,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+ EXTRA_DIST = $(privlibexec_SCRIPTS) verify-evolution-install.sh \
+diff -uNr evolution-1.4.5.orig/tools/Makefile.in evolution-1.4.5/tools/Makefile.in
+--- evolution-1.4.5.orig/tools/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/tools/Makefile.in 2004-04-28 13:08:17.000000000 +0000
+@@ -242,7 +242,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.am evolution-1.4.5/widgets/misc/Makefile.am
+--- evolution-1.4.5.orig/widgets/misc/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/widgets/misc/Makefile.am 2004-04-28 13:07:48.000000000 +0000
+@@ -6,7 +6,6 @@
+ -I$(top_srcdir)/widgets/shortcut-bar \
+ -DMAP_DIR=\""$(imagesdir)"\" \
+ -DG_LOG_DOMAIN=__FILE__ \
+- -DG_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+ privlib_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.in evolution-1.4.5/widgets/misc/Makefile.in
+--- evolution-1.4.5.orig/widgets/misc/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/widgets/misc/Makefile.in 2004-04-28 13:07:58.000000000 +0000
+@@ -227,7 +227,6 @@
+ -I$(top_srcdir)/widgets/shortcut-bar \
+ -DMAP_DIR=\""$(imagesdir)"\" \
+ -DG_LOG_DOMAIN=__FILE__ \
+- -DG_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+
diff --git a/mail-client/evolution/files/evolution-1.4.5-nztimezone.patch b/mail-client/evolution/files/evolution-1.4.5-nztimezone.patch
new file mode 100644
index 000000000000..452f746ea3bc
--- /dev/null
+++ b/mail-client/evolution/files/evolution-1.4.5-nztimezone.patch
@@ -0,0 +1,53 @@
+Index: camel-mime-utils.c
+===================================================================
+RCS file: /cvs/gnome/evolution/camel/camel-mime-utils.c,v
+retrieving revision 1.183.4.4
+diff -u -r1.183.4.4 camel-mime-utils.c
+--- camel-mime-utils.c 26 Sep 2003 16:04:49 -0000 1.183.4.4
++++ camel-mime-utils.c 8 Oct 2003 16:40:41 -0000
+@@ -3530,12 +3530,12 @@
+ offset = (*inptr++)=='-'?-1:1;
+ offset = offset * header_decode_int(&inptr);
+ d(printf("abs signed offset = %d\n", offset));
+- if (offset < -1200 || offset > 1200)
++ if (offset < -1200 || offset > 1400)
+ offset = 0;
+ } else if (isdigit(*inptr)) {
+ offset = header_decode_int(&inptr);
+ d(printf("abs offset = %d\n", offset));
+- if (offset < -1200 || offset > 1200)
++ if (offset < -1200 || offset > 1400)
+ offset = 0;
+ } else {
+ char *tz = decode_token(&inptr);
+Index: camel-text-index.c
+===================================================================
+RCS file: /cvs/gnome/evolution/camel/camel-text-index.c,v
+retrieving revision 1.16
+diff -u -r1.16 camel-text-index.c
+--- camel-text-index.c 11 Jun 2003 19:38:33 -0000 1.16
++++ camel-text-index.c 8 Oct 2003 16:40:44 -0000
+@@ -55,6 +55,8 @@
+ /* cursor debug */
+ #define c(x)
+
++#define CAMEL_TEXT_INDEX_MAX_WORDLEN (60)
++
+ #ifdef ENABLE_THREADS
+ #define CAMEL_TEXT_INDEX_LOCK(kf, lock) (e_mutex_lock(((CamelTextIndex *)kf)->priv->lock))
+ #define CAMEL_TEXT_INDEX_UNLOCK(kf, lock) (e_mutex_unlock(((CamelTextIndex *)kf)->priv->lock))
+@@ -1478,11 +1480,12 @@
+ utf8[utf8len] = 0;
+ g_string_append(p->buffer, utf8);
+ } else {
+- if (p->buffer->len) {
++ if (p->buffer->len < CAMEL_TEXT_INDEX_MAX_WORDLEN) {
+ text_index_name_add_word(idn, p->buffer->str);
+ /*camel_index_name_add_word(idn, p->buffer->str);*/
+- g_string_truncate(p->buffer, 0);
+ }
++
++ g_string_truncate (p->buffer, 0);
+ }
+ }
+
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
new file mode 100644
index 000000000000..e5f0495c7a9b
--- /dev/null
+++ b/mail-client/evolution/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<maintainer><email>liquidx@gentoo.org</email></maintainer>
+</pkgmetadata>