Added yet not in the tree evolution-2.10.2.

svn path=/; revision=30

23 files changed, 1685 insertions, 0 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
new file mode 100644
index 0000000..b1e210f
--- /dev/null
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -0,0 +1,607 @@
+# ChangeLog for gnome-extra/evolution-data-server
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.124 2007/06/02 03:27:37 leio Exp $
+
+  02 Jun 2007; <leio@gentoo.org> -evolution-data-server-1.8.2.ebuild,
+  -evolution-data-server-1.8.3.ebuild,
+  -evolution-data-server-1.8.3-r1.ebuild,
+  -evolution-data-server-1.8.3-r2.ebuild:
+  Remove old
+
+  02 Jun 2007; Brent Baude <ranger@gentoo.org>
+  evolution-data-server-1.8.3-r4.ebuild:
+  Marking evolution-data-server-1.8.3-r4 ppc stable for bug #171107
+
+  31 May 2007; Jeroen Roovers <jer@gentoo.org>
+  evolution-data-server-1.8.3-r4.ebuild:
+  Stable for HPPA (bug #171107).
+
+  31 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  evolution-data-server-1.8.3-r4.ebuild:
+  Marked stable on amd64 for bug #171107
+
+  31 May 2007; Brent Baude <ranger@gentoo.org>
+  evolution-data-server-1.8.3-r4.ebuild:
+  Marking evolution-data-server-1.8.3-r4 ppc64 stable for bug #171107
+
+  30 May 2007; Raúl Porcel <armin76@gentoo.org>
+  evolution-data-server-1.8.3-r4.ebuild:
+  alpha/ia64 stable wrt #171107
+
+  29 May 2007; Andrej Kacian <ticho@gentoo.org>
+  evolution-data-server-1.8.3-r4.ebuild:
+  Stable on x86, bug #171107.
+
+  29 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.8.3-r4.ebuild:
+  Stable on sparc wrt #171107
+
+*evolution-data-server-1.10.1-r2 (03 May 2007)
+*evolution-data-server-1.8.3-r4 (03 May 2007)
+
+  03 May 2007; <pva@gentoo.org>
+  files/evolution-data-server-APOP-auth-fix.patch,
+  -evolution-data-server-1.8.3-r3.ebuild,
+  +evolution-data-server-1.8.3-r4.ebuild,
+  -evolution-data-server-1.10.1-r1.ebuild,
+  +evolution-data-server-1.10.1-r2.ebuild:
+  Respect String Freeze in the stable branch in ${PN}-APOP-auth-fix.patch.
+
+*evolution-data-server-1.10.1-r1 (01 May 2007)
+*evolution-data-server-1.8.3-r3 (01 May 2007)
+
+  01 May 2007; <pva@gentoo.org>
+  +files/evolution-data-server-APOP-auth-fix.patch,
+  +evolution-data-server-1.8.3-r3.ebuild,
+  -evolution-data-server-1.10.0.ebuild,
+  -evolution-data-server-1.10.1.ebuild,
+  +evolution-data-server-1.10.1-r1.ebuild:
+  Fixed APOP authentication vulnerability (CVE-2007-1558). Thank Sune
+  Kloppenborg Jeppesen <jaervosz AT gentoo.org> for report. Removed vulnerable
+  versions from 1.10 branch.
+
+  18 Apr 2007; Roy Marples <uberlord@gentoo.org>
+  evolution-data-server-1.8.3.ebuild, evolution-data-server-1.8.3-r1.ebuild,
+  evolution-data-server-1.8.3-r2.ebuild,
+  evolution-data-server-1.10.1.ebuild:
+  Blessed with the ~x86-fbsd keyword.
+
+*evolution-data-server-1.10.1 (16 Apr 2007)
+
+  16 Apr 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +evolution-data-server-1.10.1.ebuild:
+  Bump to 1.10.1
+
+*evolution-data-server-1.8.3-r2 (16 Apr 2007)
+
+  16 Apr 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-data-server-1.8.3-dst.patch.gz,
+  +evolution-data-server-1.8.3-r2.ebuild:
+  Bump to 1.8.3-r2
+  	Fix DST changes; bug #172835
+
+*evolution-data-server-1.10.0 (27 Mar 2007)
+
+  27 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-data-server-1.9.91-as-needed.patch,
+  +evolution-data-server-1.10.0.ebuild:
+  gnome 2.18.0
+
+*evolution-data-server-1.8.3-r1 (01 Mar 2007)
+
+  01 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-data-server-1.8.3-category.patch,
+  +evolution-data-server-1.8.3-r1.ebuild:
+  Bump to 1.8.3-r1
+  
+  - Add patch from upstream to fix adding contacts to new mail in non-english
+  locales.
+
+*evolution-data-server-1.8.3 (08 Feb 2007)
+
+  08 Feb 2007; Mart Raudsepp <leio@gentoo.org>
+  +evolution-data-server-1.8.3.ebuild:
+  New version for translation updates
+
+  21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Stable on IA64, bug 156662.
+
+  18 Jan 2007; Jeroen Roovers <jer@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Stable for HPPA (bug #147751).
+
+  14 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Stable on Alpha.
+
+  10 Jan 2007; Mart Raudsepp <leio@gentoo.org>
+  -files/evolution-data-server-1.2.3-gcc4.patch,
+  -files/evolution-data-server-1.8.1-inbox-folders.patch,
+  -evolution-data-server-1.4.2.1.ebuild,
+  -evolution-data-server-1.8.1-r1.ebuild:
+  Prune old versions
+
+  21 Dec 2006; Markus Rothe <corsair@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Stable on ppc64; bug #156662
+
+  18 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Stable on sparc
+
+  16 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Stable on ppc wrt bug #156662.
+
+  11 Dec 2006; Daniel Gryniewicz <dang@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Marked stable on amd64 for bug #156662
+
+  10 Dec 2006; Andrej Kacian <ticho@gentoo.org>
+  evolution-data-server-1.8.2.ebuild:
+  Stable on x86, bug #156662.
+
+*evolution-data-server-1.8.2 (21 Nov 2006)
+
+  21 Nov 2006; <dang@gentoo.org> +evolution-data-server-1.8.2.ebuild:
+  Bump to 1.8.2
+
+  06 Nov 2006; John N. Laliberte <allanonjl@gentoo.org>
+  evolution-data-server-1.8.1-r1.ebuild:
+  add WANT_AUTOMAKE/WANT_AUTOCONF, fixes #154127
+
+*evolution-data-server-1.8.1-r1 (01 Nov 2006)
+
+  01 Nov 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/evolution-data-server-1.8.1-inbox-folders.patch,
+  -evolution-data-server-1.8.0.ebuild, -evolution-data-server-1.8.1.ebuild,
+  +evolution-data-server-1.8.1-r1.ebuild:
+  apply patch to fix subfolder problem with exchange.  fixes #151048
+
+  19 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  Stable on Alpha.
+
+*evolution-data-server-1.8.1 (12 Oct 2006)
+
+  12 Oct 2006; Mart Raudsepp <leio@gentoo.org>
+  +evolution-data-server-1.8.1.ebuild:
+  Version bump
+
+  16 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  evolution-data-server-1.8.0.ebuild:
+  Add a keyring use flag to enable gnome-keyring support
+
+  13 Sep 2006; Aron Griffis <agriffis@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  Mark 1.6.2 stable on ia64. #139612
+
+*evolution-data-server-1.8.0 (07 Sep 2006)
+
+  07 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-data-server-1.7.3-exchange-storage.patch,
+  +files/evolution-data-server-1.7.3-libdb.patch,
+  +files/evolution-data-server-1.7.4-move-subdirs.patch,
+  +files/evolution-data-server-1.8.0-camel-rewind.patch,
+  +evolution-data-server-1.8.0.ebuild:
+  New version for gnome 2.16
+
+  06 Sep 2006; Joshua Kinard <kumba@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild, evolution-data-server-1.6.2.ebuild:
+  Removing mips keywords as gnome is no longer supported on mips.
+
+  16 Aug 2006; Markus Rothe <corsair@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  Stable on ppc64
+
+  23 Jul 2006; Daniel Gryniewicz <dang@gentoo.org>
+  -files/evolution-data-server-1.2.1-local-provider.patch,
+  -evolution-data-server-1.6.0.ebuild, -evolution-data-server-1.6.1.ebuild:
+  Clean up unnecessary versions
+
+  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  Marked stable on amd64 for bug #139612
+
+  16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  hppa stable, bug #139612
+
+  14 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  ppc stable, bug #139612
+
+  12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  Stable on x86 wrt bug #139612.
+
+  10 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.6.2.ebuild:
+  Stable on sparc wrt #139612
+
+  03 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
+  -evolution-data-server-1.2.3.ebuild:
+  remove old version depending on mozilla
+
+*evolution-data-server-1.6.2 (27 Jun 2006)
+
+  27 Jun 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +evolution-data-server-1.6.2.ebuild:
+  Bump for 2.14.2
+
+*evolution-data-server-1.6.1 (06 May 2006)
+
+  06 May 2006; <dang@gentoo.org> +evolution-data-server-1.6.1.ebuild:
+  Bump for 2.14.1
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  evolution-data-server-1.2.3.ebuild, evolution-data-server-1.4.2.1.ebuild,
+  evolution-data-server-1.6.0.ebuild:
+  Restrict confcache as per bug #130117.
+
+  30 Mar 2006; Leonardo Boshell <leonardop@gentoo.org>
+  -files/evolution-data-server-1.0.2-amd64_mutex.patch,
+  -evolution-data-server-1.0.2.ebuild, -evolution-data-server-1.0.3.ebuild,
+  -evolution-data-server-1.0.4.ebuild,
+  -evolution-data-server-1.4.1.1.ebuild, evolution-data-server-1.6.0.ebuild:
+  Purging old ebuilds. Dropped 'static' USE flag. Removed USE_DESTDIR.
+
+*evolution-data-server-1.6.0 (18 Mar 2006)
+
+  18 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +evolution-data-server-1.6.0.ebuild:
+  new version
+
+  03 Feb 2006; Guy Martin <gmsoft@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild:
+  Stable on hppa.
+
+  02 Feb 2006; Aron Griffis <agriffis@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild:
+  Mark 1.4.2.1 stable on alpha
+
+  02 Feb 2006; Aron Griffis <agriffis@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild:
+  Mark 1.4.2.1 stable on ia64
+
+  22 Jan 2006; Markus Rothe <corsair@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild:
+  Stable on ppc64
+
+  22 Jan 2006; <dang@gentoo.org> evolution-data-server-1.4.2.1.ebuild:
+  Marked stable on amd64 per bug #119634
+
+  22 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild:
+  Marked ppc stable for bug #119634; Stabilize Gnome-2.12.2
+
+  22 Jan 2006; Joshua Jackson <tsunam@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild:
+  Stable on x86 for bug #119634; Stabilize Gnome-2.12.2
+
+  20 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.4.2.1.ebuild:
+  Stable on sparc wrt #119634
+
+  08 Jan 2006; <dang@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  Downgrade arm to ~ because of mozilla dep, to allow repoman to commit
+
+  08 Jan 2006; <dang@gentoo.org>
+  +files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch,
+  evolution-data-server-1.4.2.1.ebuild:
+  Add fix for calendar crash. Bug #86174
+
+  04 Dec 2005; <dang@gentoo.org> evolution-data-server-1.4.2.1.ebuild:
+  Begin removing mozilla/firefox as sources for nspf/nss per mozilla herd
+
+*evolution-data-server-1.4.2.1 (01 Dec 2005)
+
+  01 Dec 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +evolution-data-server-1.4.2.1.ebuild:
+  New version.
+
+*evolution-data-server-1.4.1.1 (05 Nov 2005)
+
+  05 Nov 2005; <dang@gentoo.org> -evolution-data-server-1.4.0.ebuild,
+  +evolution-data-server-1.4.1.1.ebuild:
+  Revbump.  Fixed exchange-storage crashes
+
+  25 Oct 2005; <dang@gentoo.org> evolution-data-server-1.4.1.ebuild:
+  older gtk-doc doesn't support named enumerations. Bug #110151
+
+  10 Oct 2005; Hardave Riar <hardave@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  Stable on mips.
+
+*evolution-data-server-1.4.1 (04 Oct 2005)
+
+  04 Oct 2005; <dang@gentoo.org> +evolution-data-server-1.4.1.ebuild:
+  New version
+
+  14 Sep 2005; <dang@gentoo.org> evolution-data-server-1.4.0.ebuild:
+  Remove firefox flag for now, as evo can't be built against it yet and have
+  working ssl
+
+  10 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  evolution-data-server-1.4.0.ebuild:
+  Move pkg-config calls to src_compile() to avoid problems in binary
+  packages.
+
+*evolution-data-server-1.4.0 (05 Sep 2005)
+
+  05 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -evolution-data-server-1.3.8.ebuild, +evolution-data-server-1.4.0.ebuild:
+  New version.
+
+*evolution-data-server-1.3.8 (29 Aug 2005)
+
+  29 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  files/evolution-data-server-no_lazy_bindings.patch,
+  -evolution-data-server-1.3.7.ebuild, +evolution-data-server-1.3.8.ebuild:
+  New version. Fixed patch. Added 'firefox' USE flag.
+
+  22 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  Stable on ia64.
+
+  22 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  stable on alpha
+
+*evolution-data-server-1.3.7 (17 Aug 2005)
+
+  17 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +evolution-data-server-1.3.7.ebuild,
+  +files/evolution-data-server-no_lazy_bindings.patch:
+  New version. Added 'static' and 'krb4' USE flags. Updated dependencies.
+  Added patch to avoid lazy linking in a setgid binary.
+
+  02 Aug 2005; Simon Stelling <blubb@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  stable on amd64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  ppc stable
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  Stable on hppa.
+
+  26 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  Stable on sparc
+
+  25 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  evolution-data-server-1.2.3.ebuild:
+  Stable on x86.
+
+  17 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  evolution-data-server-1.2.1-r1.ebuild, evolution-data-server-1.2.3.ebuild:
+  add libgnomeui as a dep. configure checks for it.  fixes #91628
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  evolution-data-server-1.2.1-r1.ebuild:
+  stable on mips
+
+  23 Jun 2005; Guy Martin <gmsoft@gentoo.org>
+  evolution-data-server-1.2.1-r1.ebuild:
+  Stable on hppa.
+
+  17 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  evolution-data-server-1.2.1-r1.ebuild:
+  Stable on alpha
+
+  12 Jun 2005; Olivier Crête <tester@gentoo.org>
+  evolution-data-server-1.2.1-r1.ebuild:
+  Stable on amd64
+
+  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  evolution-data-server-1.2.1-r1.ebuild:
+  Stable on ppc.
+
+  10 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/evolution-data-server-1.2.3-gcc4.patch,
+  evolution-data-server-1.2.3.ebuild:
+  Adding upstream patch to fix compilation with gcc4
+
+  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.2.1-r1.ebuild:
+  Stable on sparc
+
+*evolution-data-server-1.2.3 (09 Jun 2005)
+
+  09 Jun 2005; Marinus Schraal <foser@gentoo.org> evolution-data-server-1.2.3.ebuild :
+  New release
+
+*evolution-data-server-1.2.1-r1 (09 Jun 2005)
+
+  09 Jun 2005; <brix@gentoo.org>
+  +files/evolution-data-server-1.2.1-local-provider.patch,
+  +evolution-data-server-1.2.1-r1.ebuild:
+  Apply patch from upstream, fixing bug #87043 (Evolution mail folder pane
+  doesn't update).
+
+  18 May 2005; Jason Wever <weeve@gentoo.org>
+  evolution-data-server-1.0.4.ebuild:
+  Stable on SPARC.
+
+  11 May 2005; Guy Martin <gmsoft@gentoo.org>
+  evolution-data-server-1.0.4.ebuild:
+  Stable on hppa.
+
+  08 May 2005; Herbie Hopkins <herbs@gentoo.org>
+  evolution-data-server-1.0.4.ebuild:
+  Stable on amd64.
+
+  28 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.0.4.ebuild:
+  Stable on alpha.
+
+  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.0.4.ebuild:
+  Stable on ia64.
+
+  25 Apr 2005; Mike Gardiner <obz@gentoo.org>
+  evolution-data-server-1.0.4.ebuild:
+  Keyworded ppc x86
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  evolution-data-server-1.0.3.ebuild:
+  stable on amd64
+
+  02 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
+  evolution-data-server-1.0.3.ebuild:
+  stable on mips
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  evolution-data-server-1.2.0-r1.ebuild, evolution-data-server-1.2.1.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
+
+*evolution-data-server-1.2.1 (21 Mar 2005)
+
+  21 Mar 2005; Mike Gardiner <obz@gentoo.org>
+  +evolution-data-server-1.2.1.ebuild:
+  New version
+
+  20 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.0.3.ebuild:
+  Stable on alpha.
+
+*evolution-data-server-1.2.0-r1 (19 Mar 2005)
+
+  19 Mar 2005; Mike Gardiner <obz@gentoo.org>
+  +evolution-data-server-1.2.0-r1.ebuild:
+  The camel backends have been moved into evolution-data-server from
+  evolution, so we need to handle the ssl detection properly. See bug
+  #85086 for more information
+
+  09 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.0.3.ebuild:
+  Stable on sparc
+
+*evolution-data-server-1.2.0 (09 Mar 2005)
+
+  09 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/evolution-data-server-1.2.0-gentoo_etc_services.patch,
+  +evolution-data-server-1.2.0.ebuild:
+  gnome-2.10 release
+
+  09 Mar 2005; Mike Gardiner <obz@gentoo.org>
+  evolution-data-server-1.0.3.ebuild:
+  Keyworded x86 ppc
+
+*evolution-data-server-1.0.4 (02 Mar 2005)
+
+  02 Mar 2005; Mike Gardiner <obz@gentoo.org>
+  +evolution-data-server-1.0.4.ebuild:
+  New version
+
+  04 Feb 2005; Stephen P. Becker <geoman@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  stable on mips
+
+  20 Jan 2005; Aron Griffis <agriffis@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  stable on ia64
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  Stable on amd64.
+
+*evolution-data-server-1.0.3 (30 Dec 2004)
+
+  30 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +evolution-data-server-1.0.3.ebuild:
+  New version
+
+  23 Dec 2004; Guy Martin <gmsoft@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  Stable on hppa.
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  Stable on ppc64
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  Stable on alpha.
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  Stable on sparc
+
+  11 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  Keyworded ppc for GNOME 2.8
+
+  11 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  Marked ~ppc64
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  fix for am64, take2
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  add workaround for different mutex.h for amd64 (#67818)
+
+*evolution-data-server-1.0.2 (16 Oct 2004)
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  -evolution-data-server-1.0.0.ebuild, +evolution-data-server-1.0.2.ebuild:
+  version bump. add amd64 fix for libdb (#64911).
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org>
+  evolution-data-server-1.0.1.ebuild:
+  Added ~hppa to KEYWORDS.
+
+*evolution-data-server-1.0.1 (01 Oct 2004)
+
+  01 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  +evolution-data-server-1.0.1.ebuild:
+  version bump
+
+  30 Sep 2004; Stephen P. Becker <geoman@gentoo.org>
+  evolution-data-server-1.0.0.ebuild:
+  added ~mips keyword
+
+  28 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  evolution-data-server-1.0.0.ebuild:
+  Keyworded ~sparc wrt #64135
+
+  21 Sep 2004; Travis Tilley <lv@gentoo.org>
+  evolution-data-server-1.0.0.ebuild:
+  added ~amd64 keyword
+
+*evolution-data-server-1.0.0 (17 Sep 2004)
+
+  17 Sep 2004; foser <foser@gentoo.org> evolution-data-server-1.0.0.ebuild :
+  Gnome 2.8 release
+
+*evolution-data-server-0.0.99 (13 Sep 2004)
+
+  13 Sep 2004; Brandon Hale <tseng@gentoo.org>
+  +evolution-data-server-0.0.99.ebuild:
+  Version bump, closes bug #62583
+
+  29 Aug 2004; David Holm <dholm@gentoo.org>
+  evolution-data-server-0.0.98.ebuild:
+  Added to ~ppc.
+
+*evolution-data-server-0.0.98 (24 Aug 2004)
+
+  24 Aug 2004; Brandon Hale <tseng@gentoo.org>
+  +evolution-data-server-0.0.98.ebuild:
+  Version bump.
+
+*evolution-data-server-0.0.97 (06 Aug 2004)
+
+  06 Aug 2004; Alastair Tse <liquidx@gentoo.org>
+  +evolution-data-server-0.0.97.ebuild:
+  initial commit for evolution-data-server ebuild. based on ebuild submitted buy
+  Joe McCann <joe@breakmygentoo.net> (#35456)
+
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
new file mode 100644
index 0000000..6a33497
--- /dev/null
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -0,0 +1,68 @@
+AUX evolution-data-server-1.2.0-gentoo_etc_services.patch 815 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 SHA1 9248c74b334534f74e027fc119509673bff4542f SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a
+MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+AUX evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699 RMD160 e0db9849069760d48f19c896c84b86a7dca8f2f1 SHA1 9be26e26a13232be1f9fa10ccb3f76fe4f8cf830 SHA256 84a915393a2a92f93a721a8cbbd3756184e1317d760a0c9b922daace75430135
+MD5 e60b90d23a97fbaabc6d4d3467dc47b2 files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699
+RMD160 e0db9849069760d48f19c896c84b86a7dca8f2f1 files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699
+SHA256 84a915393a2a92f93a721a8cbbd3756184e1317d760a0c9b922daace75430135 files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699
+AUX evolution-data-server-1.7.3-exchange-storage.patch 1268 RMD160 a062861e8e806440148c02068a9f064ef41736c8 SHA1 3a47921ea24cdcc21c4c71beaf1f7c22c3f200c2 SHA256 06ff8bbfa11707e46d5240867aea2e603ac3a92a47319264d9865314777a53e3
+MD5 fa5779696401385afd6ef25b726ffd09 files/evolution-data-server-1.7.3-exchange-storage.patch 1268
+RMD160 a062861e8e806440148c02068a9f064ef41736c8 files/evolution-data-server-1.7.3-exchange-storage.patch 1268
+SHA256 06ff8bbfa11707e46d5240867aea2e603ac3a92a47319264d9865314777a53e3 files/evolution-data-server-1.7.3-exchange-storage.patch 1268
+AUX evolution-data-server-1.7.3-libdb.patch 531 RMD160 be384a889bffa1449a88db5ffcf964ff4e3e14a3 SHA1 ca65f275a13356028e06d95e6020b5e6c8296ade SHA256 87963a45d6428f737801acc2db5766a1c076440fc5f101e0fcd55e7b41b84810
+MD5 14007751f6b6a7de8e8fa9aafd67721c files/evolution-data-server-1.7.3-libdb.patch 531
+RMD160 be384a889bffa1449a88db5ffcf964ff4e3e14a3 files/evolution-data-server-1.7.3-libdb.patch 531
+SHA256 87963a45d6428f737801acc2db5766a1c076440fc5f101e0fcd55e7b41b84810 files/evolution-data-server-1.7.3-libdb.patch 531
+AUX evolution-data-server-1.7.4-move-subdirs.patch 819 RMD160 8f388a352a6719c1705685cfdeb648b9740bd9d5 SHA1 9a269618c999e6cf35ae80c2808db254ca932cdb SHA256 ec3bf9d06f293fdaa361155bf728b6ce12700f1f8f6641f544e246275d554a5c
+MD5 8d14530034780e78ba4dc69d60d5ec59 files/evolution-data-server-1.7.4-move-subdirs.patch 819
+RMD160 8f388a352a6719c1705685cfdeb648b9740bd9d5 files/evolution-data-server-1.7.4-move-subdirs.patch 819
+SHA256 ec3bf9d06f293fdaa361155bf728b6ce12700f1f8f6641f544e246275d554a5c files/evolution-data-server-1.7.4-move-subdirs.patch 819
+AUX evolution-data-server-1.8.0-camel-rewind.patch 499 RMD160 90b94f0b20a52a4fdf476bcfa5fe0ad2a064d488 SHA1 db7d42df20ab50d81835b9c1b9ebed84d1e0d8cb SHA256 1323e9dc957e3cc02fd1628fa21d448c8c985028e5b57d03596b6bde9ad66e0e
+MD5 884ee385ed5e2b858a6ce4030e7248a9 files/evolution-data-server-1.8.0-camel-rewind.patch 499
+RMD160 90b94f0b20a52a4fdf476bcfa5fe0ad2a064d488 files/evolution-data-server-1.8.0-camel-rewind.patch 499
+SHA256 1323e9dc957e3cc02fd1628fa21d448c8c985028e5b57d03596b6bde9ad66e0e files/evolution-data-server-1.8.0-camel-rewind.patch 499
+AUX evolution-data-server-1.8.3-category.patch 848 RMD160 996e6a7f6ea137762974d6ce74525d8075d19fb6 SHA1 06b942c068701d231f2e9259f56d061e03afaec1 SHA256 e0baf68b129f6be2858e35eff8738d3cd84e34db543e2a4545aefc151393d905
+MD5 f3fdb3801c172ac879df2259df79f9a6 files/evolution-data-server-1.8.3-category.patch 848
+RMD160 996e6a7f6ea137762974d6ce74525d8075d19fb6 files/evolution-data-server-1.8.3-category.patch 848
+SHA256 e0baf68b129f6be2858e35eff8738d3cd84e34db543e2a4545aefc151393d905 files/evolution-data-server-1.8.3-category.patch 848
+AUX evolution-data-server-1.8.3-dst.patch.gz 6376 RMD160 e8d9b8948d86a2c937cc28c79811c52bc2adc391 SHA1 d6138ccac57fb4638bb95c11706965ec30e5388e SHA256 16261fae1a9c0bc388fceee3ec18184c82449481c94cbca28998d995b8131b47
+MD5 28ce2e76e8b6bb54f814e98d9c548ef5 files/evolution-data-server-1.8.3-dst.patch.gz 6376
+RMD160 e8d9b8948d86a2c937cc28c79811c52bc2adc391 files/evolution-data-server-1.8.3-dst.patch.gz 6376
+SHA256 16261fae1a9c0bc388fceee3ec18184c82449481c94cbca28998d995b8131b47 files/evolution-data-server-1.8.3-dst.patch.gz 6376
+AUX evolution-data-server-1.9.91-as-needed.patch 3305 RMD160 b4e19cdf22885530966922fb173e33c31445405b SHA1 7047c935eaeeabfe5fbbacafc23d608de6876b5d SHA256 50343d5e7f4f98bdc9335bd5991d77ccaef701d2eff0e7418259740892795c90
+MD5 bfaee338c362bdf3d4960767076a0fcb files/evolution-data-server-1.9.91-as-needed.patch 3305
+RMD160 b4e19cdf22885530966922fb173e33c31445405b files/evolution-data-server-1.9.91-as-needed.patch 3305
+SHA256 50343d5e7f4f98bdc9335bd5991d77ccaef701d2eff0e7418259740892795c90 files/evolution-data-server-1.9.91-as-needed.patch 3305
+AUX evolution-data-server-APOP-auth-fix.patch 1176 RMD160 817f3788642a2c341c5424d517653f6251bef024 SHA1 badff11a933a2eb2bb65e35f20bd472e56f8eb43 SHA256 a9b7b0582763e75c79f589bfde0ae5782e80988bec0cd40e8b608ef07823c5ec
+MD5 18f210bcc73eac3355bfade58a4ad039 files/evolution-data-server-APOP-auth-fix.patch 1176
+RMD160 817f3788642a2c341c5424d517653f6251bef024 files/evolution-data-server-APOP-auth-fix.patch 1176
+SHA256 a9b7b0582763e75c79f589bfde0ae5782e80988bec0cd40e8b608ef07823c5ec files/evolution-data-server-APOP-auth-fix.patch 1176
+AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403
+MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
+RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c files/evolution-data-server-no_lazy_bindings.patch 551
+SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 files/evolution-data-server-no_lazy_bindings.patch 551
+DIST evolution-data-server-1.10.2.tar.bz2 7122238 RMD160 1fc5915338427a306e46a1c37bfc913fa05936a3 SHA1 0364dbf18306f9f36cdae37703f47571cb2a93fe SHA256 dc9772f92818c1846127df32524caaa4c266460af5bbd0e2254d0dba4fa36432
+DIST evolution-data-server-1.8.3.tar.bz2 7024111 RMD160 8051f35a0db514f919bf730cd35c37ea75029061 SHA1 f822fe520d778d0cd8efe8d6a767a5c0b483e798 SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc
+EBUILD evolution-data-server-1.10.2.ebuild 4437 RMD160 aa3faa874c6509ed9a757cde93249be423608c0e SHA1 db609be45091d6ffd8c40a475fd964467582ace6 SHA256 5db374a309452bf1088376f4a923e9b2974a1d6249227e82163ea034afedc0c2
+MD5 ed4fc5fe5708c865b8e03efc162c5868 evolution-data-server-1.10.2.ebuild 4437
+RMD160 aa3faa874c6509ed9a757cde93249be423608c0e evolution-data-server-1.10.2.ebuild 4437
+SHA256 5db374a309452bf1088376f4a923e9b2974a1d6249227e82163ea034afedc0c2 evolution-data-server-1.10.2.ebuild 4437
+EBUILD evolution-data-server-1.8.3-r4.ebuild 5053 RMD160 7b1429b4afc6a27d89ac4b26bc8acb6218122520 SHA1 57b94f88ab968e9477509625919a9e48af1e5234 SHA256 6a15ab0000271f4cdbaf549ed8905ad2be34c17ffb3ba27b4d201ba559b5fc8d
+MD5 486dbe803a6dd996e444acee5b9ff80f evolution-data-server-1.8.3-r4.ebuild 5053
+RMD160 7b1429b4afc6a27d89ac4b26bc8acb6218122520 evolution-data-server-1.8.3-r4.ebuild 5053
+SHA256 6a15ab0000271f4cdbaf549ed8905ad2be34c17ffb3ba27b4d201ba559b5fc8d evolution-data-server-1.8.3-r4.ebuild 5053
+MISC ChangeLog 19479 RMD160 59b6d6615fd3d8e61ac485c564708f743611efa0 SHA1 ba78bbd9203d059a077fb253a03b809b3896b69c SHA256 fa2855cb27f04fa00bb82ce27aafac8ee7b91e94974041b26abfe5a5b9acbdf5
+MD5 d79a72a1c45be2146c25aee179eaaa91 ChangeLog 19479
+RMD160 59b6d6615fd3d8e61ac485c564708f743611efa0 ChangeLog 19479
+SHA256 fa2855cb27f04fa00bb82ce27aafac8ee7b91e94974041b26abfe5a5b9acbdf5 ChangeLog 19479
+MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
+MD5 11300ebf1f4999399cc1536ceccc0d93 files/digest-evolution-data-server-1.10.2 292
+RMD160 8d19d9853ab4a56fbb50386a791771438b6c3378 files/digest-evolution-data-server-1.10.2 292
+SHA256 db08d3da5e01a2208cda82e2b8b13f91ab2d1319f96c9dca852b7be284611514 files/digest-evolution-data-server-1.10.2 292
+MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3-r4 289
+RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3-r4 289
+SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3-r4 289
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.10.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.10.2.ebuild
new file mode 100644
index 0000000..50d1ef2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.10.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r2.ebuild,v 1.1 2007/05/03 12:06:33 pva Exp $
+
+inherit db-use eutils flag-o-matic gnome2 autotools
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 Sleepycat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+
+RDEPEND=">=dev-libs/glib-2.10
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gnome-common-2
+	keyring? ( gnome-base/gnome-keyring )
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=net-libs/libsoup-2.2.90
+	sys-libs/zlib
+	=sys-libs/db-4*
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+RESTRICT="confcache"
+
+pkg_setup() {
+	G2CONF="$(use_with ldap openldap)       \
+		$(use_with kerberos krb5 /usr)      \
+		$(use_enable ssl nss)               \
+		$(use_enable ssl smime)             \
+		$(use_enable ipv6)                  \
+		$(use_enable keyring gnome-keyring) \
+		--with-libdb=/usr/$(get_libdir)"
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix what ?
+	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+
+	# Fix broken libdb build
+	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
+
+	# Resolve symbols at execution time for setgid binaries
+	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+#-------------Upstream GNOME look here -----------------#
+
+	# --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.9.91-as-needed.patch
+
+	# fix for dep ordering so we can add libedataserverui to libexchange-storage
+	# we need to do this or: undefined reference to `e_passwords_get_password'
+	# are the kinds of errors you will get.
+
+	# move the groupwise backend and provider for addressbook, camel, and
+	# calendar to its own folder called server.deps.
+	mkdir server.deps
+	mv addressbook/backends/groupwise server.deps/addressbook
+	mv camel/providers/groupwise server.deps/camel
+	mv calendar/backends/groupwise server.deps/calendar
+
+	# now fix the autotools foo for the new directory and the removed ones
+	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
+
+	# remove groupwise folder from Makefile's since they are in a diff location
+	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am
+
+	# fix configure.in location of the Makefile's
+	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
+	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
+	# tack on the server.deps Makefile on our last edit
+	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
+
+	# fix file includes 
+	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
+
+	# Fix db version for FreeBSD users where -ldb is always db-1
+	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
+
+#---------------Upstream GNOME stop here---------------
+	eautoreconf
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		sed -i -e "s|mozilla-nss|nss|
+		s|mozilla-nspr|nspr|" ${S}/configure
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+		--without-nss-libs --without-nss-includes"
+	fi
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	cd "${S}"
+	gnome2_src_compile
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild
new file mode 100644
index 0000000..975999d
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild,v 1.8 2007/06/02 02:49:13 ranger Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+inherit db-use eutils flag-o-matic gnome2 autotools
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 Sleepycat"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gnome-common-2
+	keyring? ( gnome-base/gnome-keyring )
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=net-libs/libsoup-2.2.90
+	sys-libs/zlib
+	=sys-libs/db-4*
+	ldap? ( >=net-nds/openldap-2.0 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+RESTRICT="confcache"
+
+pkg_setup() {
+	G2CONF="$(use_with ldap openldap)	\
+		$(use_with kerberos krb5 /usr)	\
+		$(use_enable ssl nss)		\
+		$(use_enable ssl smime)		\
+		$(use_enable ipv6)		\
+		$(use_enable nntp)		\
+		$(use_enable keyring gnome-keyring)		\
+		--with-libdb=/usr/$(get_libdir)"
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
+
+	# Fix broken libdb build
+	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
+
+	# Resolve symbols at execution time for setgid binaries
+	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
+
+	# exchange-storage --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
+	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
+
+	# Fix non-english contact insertion.  Upstream bug:
+	# http://bugzilla.gnome.org/show_bug.cgi?id=405531
+	epatch "${FILESDIR}"/${P}-category.patch
+
+	# Fix DST changes; bug #172835
+	epatch "${FILESDIR}"/${P}-dst.patch.gz
+
+	# Fix vulnerability in APOP authentification; bug #174210
+	epatch "${FILESDIR}"/${PN}-APOP-auth-fix.patch
+
+#-------------Upstream GNOME look here -----------------#
+
+	# fix for dep ordering so we can add libedataserverui to libexchange-storage
+	# we need to do this or: undefined reference to `e_passwords_get_password'
+	# are the kinds of errors you will get.
+
+	# move the groupwise backend and provider for addressbook, camel, and
+	# calendar to its own folder called server.deps.
+	mkdir server.deps
+	mv addressbook/backends/groupwise server.deps/addressbook
+	mv camel/providers/groupwise server.deps/camel
+	mv calendar/backends/groupwise server.deps/calendar
+
+	# now fix the autotools foo for the new directory and the removed ones
+	echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am
+
+	# remove groupwise folder from Makefile's since they are in a diff location
+	sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am
+
+	# fix configure.in location of the Makefile's
+	sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in
+	sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in
+	# tack on the server.deps Makefile on our last edit
+	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
+
+	# fix file includes
+	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
+
+	# Fix db version for FreeBSD users where -ldb is always db-1
+	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
+
+#---------------Upstream GNOME stop here---------------
+	eautoreconf
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		NSS_LIB=/usr/$(get_libdir)/nss
+		NSS_INC=/usr/include/nss
+		NSPR_LIB=/usr/$(get_libdir)/nspr
+		NSPR_INC=/usr/include/nspr
+
+		G2CONF="${G2CONF} \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB}     \
+			--with-nss-includes=${NSS_INC}   \
+			--with-nss-libs=${NSS_LIB}"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	cd "${S}"
+	gnome2_src_compile
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.2
new file mode 100644
index 0000000..aad1499
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.2
@@ -0,0 +1,3 @@
+MD5 790dfc97a917dff8384dcb7cad42f87f evolution-data-server-1.10.2.tar.bz2 7122238
+RMD160 1fc5915338427a306e46a1c37bfc913fa05936a3 evolution-data-server-1.10.2.tar.bz2 7122238
+SHA256 dc9772f92818c1846127df32524caaa4c266460af5bbd0e2254d0dba4fa36432 evolution-data-server-1.10.2.tar.bz2 7122238
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4
new file mode 100644
index 0000000..0defb70
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4
@@ -0,0 +1,3 @@
+MD5 f6a824f2553fd97555b8785a452fb6ab evolution-data-server-1.8.3.tar.bz2 7024111
+RMD160 8051f35a0db514f919bf730cd35c37ea75029061 evolution-data-server-1.8.3.tar.bz2 7024111
+SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc evolution-data-server-1.8.3.tar.bz2 7024111
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.0-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.0-gentoo_etc_services.patch
new file mode 100644
index 0000000..ad9044e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.0-gentoo_etc_services.patch
@@ -0,0 +1,24 @@
+diff -u camel.orig/providers/imap/camel-imap-store.c camel/providers/imap/camel-imap-store.c
+--- camel.orig/providers/imap/camel-imap-store.c	2005-03-03 10:30:32.785549256 -0600
++++ camel/providers/imap/camel-imap-store.c	2005-03-03 10:33:18.970285336 -0600
+@@ -924,7 +924,7 @@
+ 		port = ssl_options[i].port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = "imap";
++		serv = "imap2";
+ 		port = IMAP_PORT;
+ 	}
+ 	
+diff -u camel.orig/providers/pop3/camel-pop3-store.c camel/providers/pop3/camel-pop3-store.c
+--- camel.orig/providers/pop3/camel-pop3-store.c	2005-03-03 10:30:32.779550168 -0600
++++ camel/providers/pop3/camel-pop3-store.c	2005-03-03 10:34:40.812843376 -0600
+@@ -308,7 +308,7 @@
+ 		port = ssl_options[i].port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = "pop3";
++		serv = "pop-3";
+ 		port = POP3S_PORT;
+ 	}
+ 	
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch
new file mode 100644
index 0000000..077168b
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.4.2.1.orig/calendar/libecal/e-cal-recur.c evolution-data-server-1.4.2.1/calendar/libecal/e-cal-recur.c
+--- evolution-data-server-1.4.2.1.orig/calendar/libecal/e-cal-recur.c	2005-09-02 10:37:43.000000000 -0400
++++ evolution-data-server-1.4.2.1/calendar/libecal/e-cal-recur.c	2006-01-08 16:31:12.000000000 -0500
+@@ -683,7 +683,7 @@
+ 					gpointer	            tz_cb_data,
+ 					icaltimezone	 *default_timezone)
+ {
+-	ECalComponentDateTime dtstart, dtend;
++	ECalComponentDateTime dtstart = {0}, dtend = {0};
+ 	time_t dtstart_time, dtend_time;
+ 	GSList *rrules = NULL, *rdates = NULL, elem;
+ 	GSList *exrules = NULL, *exdates = NULL;
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-exchange-storage.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-exchange-storage.patch
new file mode 100644
index 0000000..bf0fe7a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-exchange-storage.patch
@@ -0,0 +1,30 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.3.orig/configure.in evolution-data-server-1.7.3/configure.in
+--- evolution-data-server-1.7.3.orig/configure.in	2006-06-12 10:27:29.000000000 -0400
++++ evolution-data-server-1.7.3/configure.in	2006-07-07 10:22:49.000000000 -0400
+@@ -950,19 +950,23 @@
+ msg_krb5="no"
+ if test "x${with_krb5}" != "xno"; then
+ 	LDFLAGS_save="$LDFLAGS"
++	SAVE_LIBS="$LIBS"
+ 	
+ 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+ 	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ 	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
+ 	[
+-		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
++		LDFLAGS="$LDFLAGS -L$with_krb5_libs"
++		LIBS="$SAVE_LIBS $mitlibs"
+ 		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
+ 		[
+-			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
++			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs"
++			LIBS="$SAVE_LIBS $heimlibs"
+ 			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
+ 		])
+-		LDFLAGS="$LDFLAGS_save"
+ 	])
++	LDFLAGS="$LDFLAGS_save"
++	LIBS="$SAVE_LIBS"
+ 	if test "$ac_cv_lib_kerberos5" != "no"; then
+ 		AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
+ 		if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-libdb.patch
new file mode 100644
index 0000000..22ce75d
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.3-libdb.patch
@@ -0,0 +1,13 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.3.orig/configure.in evolution-data-server-1.7.3/configure.in
+--- evolution-data-server-1.7.3.orig/configure.in	2006-06-12 10:27:29.000000000 -0400
++++ evolution-data-server-1.7.3/configure.in	2006-07-06 23:43:43.000000000 -0400
+@@ -1389,9 +1393,6 @@
+ export privincludedir
+ export privdatadir
+ AC_CONFIG_SUBDIRS(calendar/libical)
+-if test $dynamic_libdb = no; then
+-        AC_CONFIG_SUBDIRS(libdb/dist)
+-fi
+ AC_OUTPUT([
+ Makefile
+ evolution-data-server-zip
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.4-move-subdirs.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.4-move-subdirs.patch
new file mode 100644
index 0000000..13fc81a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.7.4-move-subdirs.patch
@@ -0,0 +1,14 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.4.orig/Makefile.am evolution-data-server-1.7.4/Makefile.am
+--- evolution-data-server-1.7.4.orig/Makefile.am	2006-04-24 06:39:59.000000000 -0400
++++ evolution-data-server-1.7.4/Makefile.am	2006-07-20 18:15:50.000000000 -0400
+@@ -5,8 +5,8 @@
+ LIBDB = libdb
+ endif
+ 
+-SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
+-DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
++DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
+ 
+ changelogs =			\
+ 	ChangeLog
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch
new file mode 100644
index 0000000..c420759
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.90.1.orig/camel/camel-disco-diary.c evolution-data-server-1.7.90.1/camel/camel-disco-diary.c
+--- evolution-data-server-1.7.90.1.orig/camel/camel-disco-diary.c	2006-02-16 04:36:28.000000000 -0500
++++ evolution-data-server-1.7.90.1/camel/camel-disco-diary.c	2006-08-01 22:55:43.000000000 -0400
+@@ -404,6 +404,7 @@
+ 
+ 	/* Truncate the log */
+ 	ftruncate (fileno (diary->file), 0);
++	rewind (diary->file);
+ }
+ 
+ CamelDiscoDiary *
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch
new file mode 100644
index 0000000..dd1943e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.8.3.orig/libedataserverui/e-name-selector-dialog.c evolution-data-server-1.8.3/libedataserverui/e-name-selector-dialog.c
+--- evolution-data-server-1.8.3.orig/libedataserverui/e-name-selector-dialog.c	2007-01-29 04:44:33.000000000 -0500
++++ evolution-data-server-1.8.3/libedataserverui/e-name-selector-dialog.c	2007-03-01 13:28:12.000000000 -0500
+@@ -779,7 +779,7 @@ search_changed (ENameSelectorDialog *nam
+ 	text = gtk_entry_get_text (name_selector_dialog->search_entry);
+ 	text_escaped = escape_sexp_string (text);
+ 
+-	if ( !strcmp (category,"Any Category")) {
++	if ( !strcmp (category, _("Any Category"))) {
+ 		query_string = g_strdup_printf ("(or (beginswith \"file_as\" %s) "
+ 						"    (beginswith \"full_name\" %s) "
+ 						"    (beginswith \"email\" %s) "
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz
new file mode 100644
index 0000000..a5705b6
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.9.91-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.9.91-as-needed.patch
new file mode 100644
index 0000000..3fe166f
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.9.91-as-needed.patch
@@ -0,0 +1,66 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.9.91.orig/Makefile.am evolution-data-server-1.9.91/Makefile.am
+--- evolution-data-server-1.9.91.orig/Makefile.am	2007-01-03 09:57:27.000000000 -0500
++++ evolution-data-server-1.9.91/Makefile.am	2007-02-14 13:33:26.000000000 -0500
+@@ -5,8 +5,8 @@ if ! WITH_LIBDB
+ LIBDB = libdb
+ endif
+ 
+-SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
+-DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
++DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
+ 
+ changelogs =			\
+ 	ChangeLog
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.9.91.orig/configure.in evolution-data-server-1.9.91/configure.in
+--- evolution-data-server-1.9.91.orig/configure.in	2007-02-12 09:26:16.000000000 -0500
++++ evolution-data-server-1.9.91/configure.in	2007-02-14 13:31:56.000000000 -0500
+@@ -968,7 +968,7 @@ if test "x${with_krb5}" != "xno"; then
+ 	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
+ 	[
+ 		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
+-		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
++		AC_TRY_LINK([#include <krb5.h>],krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
+ 		[
+ 			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
+ 			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
+@@ -995,11 +995,16 @@ if test "x${with_krb5}" != "xno"; then
+ 			msg_krb5="yes (Heimdal)"
+ 		fi
+ 		KRB5_LDFLAGS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
++		AC_MSG_RESULT(msg_krb5)
++	else
++		dnl AC_MSG_CHECKING([for Kerberos 5])
++		AC_MSG_RESULT([no])
++		AC_MSG_ERROR([You specified with krb5, but it was not found.])
+ 	fi
+ else
+-	AC_MSG_CHECKING(for Kerberos 5)
+-	AC_MSG_RESULT($with_krb5)
++	AC_MSG_WARN([krb5 support disabled])
+ fi
++
+ AM_CONDITIONAL(ENABLE_KRB5, test x$with_krb5 != xno)
+ 
+ AC_CHECK_HEADER([et/com_err.h],[AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have et/comm_err.h])])
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.9.91.orig/servers/exchange/storage/Makefile.am evolution-data-server-1.9.91/servers/exchange/storage/Makefile.am
+--- evolution-data-server-1.9.91.orig/servers/exchange/storage/Makefile.am	2007-01-03 09:56:23.000000000 -0500
++++ evolution-data-server-1.9.91/servers/exchange/storage/Makefile.am	2007-02-14 13:29:55.000000000 -0500
+@@ -80,14 +80,15 @@ libexchange_storage_1_2_la_LIBADD =				\
+ 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
+ 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
++	$(top_builddir)/libedataserverui/libedataserverui-1.2.la\
+ 	$(E_DATA_SERVER_LIBS)					\
+ 	$(E_DATA_SERVER_UI_LIBS)				\
+ 	$(LDAP_LIBS)						\
+ 	$(SOUP_LIBS)						\
+-	$(SOCKET_LIBS)
++	$(SOCKET_LIBS)						\
++	$(KRB5_LDFLAGS)
+ 
+ libexchange_storage_1_2_la_LDFLAGS =				\
+-	$(KRB5_LDFLAGS)						\
+ 	$(NO_UNDEFINED)						\
+ 	-version-info $(LIBEXCHANGE_STORAGE_CURRENT):$(LIBEXCHANGE_STORAGE_REVISION):$(LIBEXCHANGE_STORAGE_AGE)
+ 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
new file mode 100644
index 0000000..301bfe3
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
@@ -0,0 +1,34 @@
+diff -Naur evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c
+--- evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c	2007-05-03 15:43:23.000000000 +0400
++++ evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c	2007-05-03 15:49:15.000000000 +0400
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <ctype.h>
+ 
+ #include "camel-operation.h"
+ 
+@@ -489,7 +490,21 @@
+ 	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
+ 		char *secret, md5asc[33], *d;
+ 		unsigned char md5sum[16], *s;
+-		
++
++		d = store->engine->apop;
++
++		while (*d != '\0') {
++			if (!isascii((int)*d)) {
++
++				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
++						_("Could not connect to POP server %s"),
++						CAMEL_SERVICE (store)->url->host);
++
++				return FALSE;
++			}
++			d++;
++		}
++
+ 		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
+ 		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);
+ 		md5_get_digest(secret, strlen (secret), md5sum);
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
new file mode 100644
index 0000000..a094433
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
@@ -0,0 +1,12 @@
+diff -NurdB evolution-data-server-1.3.7/camel/Makefile.am evolution-data-server-1.3.7-patched/camel/Makefile.am
+--- evolution-data-server-1.3.7/camel/Makefile.am	2005-07-08 11:57:02.000000000 -0500
++++ evolution-data-server-1.3.7-patched/camel/Makefile.am	2005-08-17 15:40:24.000000000 -0500
+@@ -271,6 +271,8 @@
+ 	camel-lock-helper.c 			\
+ 	camel-lock-helper.h
+ 
++camel_lock_helper_1_2_LDFLAGS = -Wl,-z,now
++
+ # NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
+ # because it might be setuid.
+ camel_lock_helper_1_2_LDADD =			\
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
new file mode 100644
index 0000000..da6fd63
--- /dev/null
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
new file mode 100644
index 0000000..9b47fab
--- /dev/null
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -0,0 +1,414 @@
+# ChangeLog for gnome-extra/gtkhtml
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.102 2007/06/11 15:22:15 dang Exp $
+
+  11 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
+  Marked stable on amd64 for bug #171107
+
+  02 Jun 2007; Brent Baude <ranger@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Marking gtkhtml-3.12.3 ppc stable for bug #171107
+
+  31 May 2007; Jeroen Roovers <jer@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Stable for HPPA (bug #171107).
+
+  31 May 2007; Daniel Gryniewicz <dang@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Marked stable on amd64 for bug #171107
+
+  31 May 2007; Brent Baude <ranger@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Marking gtkhtml-3.12.3 ppc64 stable for bug #171107
+
+  30 May 2007; Raúl Porcel <armin76@gentoo.org> gtkhtml-3.12.3.ebuild:
+  alpha/ia64 stable wrt #171107
+
+  29 May 2007; Andrej Kacian <ticho@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Stable on x86, bug #171107.
+
+  29 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Stable on sparc wrt #171107
+
+  28 May 2007; Mart Raudsepp <leio@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Fix tests
+
+  04 May 2007; Roy Marples <uberlord@gentoo.org> gtkhtml-2.6.3.ebuild:
+  Added ~x86-fbsd keyword
+
+*gtkhtml-3.14.1 (16 Apr 2007)
+
+  16 Apr 2007; Daniel Gryniewicz <dang@gentoo.org> +gtkhtml-3.14.1.ebuild:
+  Bump to 3.14.1
+
+  16 Apr 2007; Markus Rothe <corsair@gentoo.org> ChangeLog:
+  Stable on ppc64
+
+*gtkhtml-3.14.0 (27 Mar 2007)
+
+  27 Mar 2007; Daniel Gryniewicz <dang@gentoo.org> +gtkhtml-3.14.0.ebuild:
+  gnome 2.18.0
+
+  10 Mar 2007; Roy Marples <uberlord@gentoo.org> gtkhtml-3.12.3.ebuild:
+  Added ~x86-fbsd keyword.
+
+  16 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  -files/gtkhtml-3.0.7-libtool.patch, gtkhtml-3.0.10.ebuild,
+  gtkhtml-3.0.10-r1.ebuild:
+  Remove libtool patch; the bug it was working around is fixed; bug #165524
+
+*gtkhtml-3.12.3 (07 Feb 2007)
+
+  07 Feb 2007; Mart Raudsepp <leio@gentoo.org> -files/gtkhtml-gcc34.patch,
+  -files/gtkhtml-gcc4.patch, -gtkhtml-2.6.0.ebuild, -gtkhtml-3.8.2.ebuild,
+  -gtkhtml-3.12.1.ebuild, +gtkhtml-3.12.3.ebuild:
+  Version bump. Punt some old versions and stale patches
+
+  21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> gtkhtml-3.12.2.ebuild:
+  Stable on IA64, bug 156662.
+
+  18 Jan 2007; Jeroen Roovers <jer@gentoo.org> gtkhtml-3.12.2.ebuild:
+  Stable for HPPA (bug #147751).
+
+  14 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> gtkhtml-3.12.2.ebuild:
+  Stable on Alpha.
+
+  21 Dec 2006; Markus Rothe <corsair@gentoo.org> gtkhtml-3.12.2.ebuild:
+  Stable on ppc64; bug #156662
+
+  21 Dec 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  -gtkhtml-1.1.10-r1.ebuild:
+  gnome-1.x removal
+
+  18 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtkhtml-3.12.2.ebuild:
+  Stable on sparc
+
+  17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  gtkhtml-3.12.2.ebuild:
+  Stable on ppc wrt bug #156662.
+
+  12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gtkhtml-3.12.2.ebuild:
+  Stable on amd64 wrt bug #156662.
+
+  10 Dec 2006; Andrej Kacian <ticho@gentoo.org> gtkhtml-3.12.2.ebuild:
+  Stable on x86, bug #156662.
+
+*gtkhtml-3.12.2 (21 Nov 2006)
+
+  21 Nov 2006; <dang@gentoo.org> +gtkhtml-3.12.2.ebuild:
+  Bump to 3.12.2
+
+  20 Oct 2006; Aron Griffis <agriffis@gentoo.org> gtkhtml-2.6.3.ebuild:
+  Mark 2.6.3 stable on alpha
+
+  14 Oct 2006; Thomas Cort <tcort@gentoo.org> gtkhtml-3.10.2.ebuild:
+  Stable on alpha.
+
+*gtkhtml-3.12.1 (12 Oct 2006)
+
+  12 Oct 2006; Mart Raudsepp <leio@gentoo.org> -gtkhtml-3.12.0.ebuild,
+  +gtkhtml-3.12.1.ebuild:
+  New version for minor translation updates
+
+  13 Sep 2006; Aron Griffis <agriffis@gentoo.org> gtkhtml-3.10.2.ebuild:
+  Mark 3.10.2 stable on ia64. #139612
+
+*gtkhtml-3.12.0 (07 Sep 2006)
+
+  07 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> +gtkhtml-3.12.0.ebuild:
+  New version for gnome 2.16
+
+  05 Sep 2006; Joshua Kinard <kumba@gentoo.org> gtkhtml-2.6.0.ebuild,
+  gtkhtml-2.6.3.ebuild, gtkhtml-3.2.4.ebuild, gtkhtml-3.2.5.ebuild,
+  gtkhtml-3.6.2.ebuild, gtkhtml-3.8.2.ebuild, gtkhtml-3.10.2.ebuild:
+  Removing mips keywords as gnome is no longer supported on mips.
+
+  16 Aug 2006; Markus Rothe <corsair@gentoo.org> gtkhtml-3.10.2.ebuild:
+  Stable on ppc64
+
+  23 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> -gtkhtml-3.6.1.ebuild,
+  -gtkhtml-3.8.1.ebuild, -gtkhtml-3.10.0.ebuild, -gtkhtml-3.10.1.ebuild:
+  Clean up unnecessary versions
+
+  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> gtkhtml-3.10.2.ebuild:
+  Marked stable on amd64 for bug #139612
+
+  16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  gtkhtml-3.10.2.ebuild:
+  hppa stable, bug #139612
+
+  14 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  gtkhtml-3.10.2.ebuild:
+  ppc stable, bug #139612
+
+  12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> gtkhtml-3.10.2.ebuild:
+  Stable on x86 wrt bug #139612.
+
+  10 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtkhtml-3.10.2.ebuild:
+  Stable on sparc wrt #139612
+
+*gtkhtml-3.10.2 (27 Jun 2006)
+
+  27 Jun 2006; Daniel Gryniewicz <dang@gentoo.org> +gtkhtml-3.10.2.ebuild:
+  Bump for 2.14.2
+
+  10 Jun 2006; John N. Laliberte <allanonjl@gentoo.org>
+  gtkhtml-3.2.4.ebuild, gtkhtml-3.2.5.ebuild, gtkhtml-3.6.1.ebuild,
+  gtkhtml-3.6.2.ebuild:
+  hack the atoms to work with portage. we should reverse this at some point in
+  the future when portage officially supports it.
+
+*gtkhtml-3.10.1 (06 May 2006)
+
+  06 May 2006; <dang@gentoo.org> +gtkhtml-3.10.1.ebuild:
+  Bump for 2.14.1
+
+  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  files/digest-gtkhtml-1.1.10-r1, files/digest-gtkhtml-2.6.0,
+  files/digest-gtkhtml-2.6.3, files/digest-gtkhtml-3.0.10,
+  files/digest-gtkhtml-3.0.10-r1, files/digest-gtkhtml-3.8.1,
+  files/digest-gtkhtml-3.8.2, Manifest:
+  Fixing SHA256 digest, pass four
+
+  19 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  gtkhtml-3.2.4.ebuild, gtkhtml-3.2.5.ebuild, gtkhtml-3.6.1.ebuild,
+  gtkhtml-3.6.2.ebuild:
+  fix atoms so we dont block the newer gtkhtml-3.10. fixes
+
+*gtkhtml-3.10.0 (18 Mar 2006)
+
+  18 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +gtkhtml-3.10.0.ebuild:
+  new version. remove static useflag. if you unmask this, it will cause
+  upgrade downgrade cycles since its in the same slot. (until we fix the deps
+  see bug #126700)
+
+  06 Feb 2006; Aron Griffis <agriffis@gentoo.org> gtkhtml-1.1.10-r1.ebuild:
+  Mark 1.1.10-r1 stable on ia64
+
+  03 Feb 2006; Guy Martin <gmsoft@gentoo.org> gtkhtml-3.8.2.ebuild:
+  Stable on hppa.
+
+  03 Feb 2006; Aron Griffis <agriffis@gentoo.org> gtkhtml-3.8.2.ebuild:
+  Mark 3.8.2 stable on alpha
+
+  02 Feb 2006; Aron Griffis <agriffis@gentoo.org> gtkhtml-3.8.2.ebuild:
+  Mark 3.8.2 stable on ia64
+
+  22 Jan 2006; Markus Rothe <corsair@gentoo.org> gtkhtml-3.8.2.ebuild:
+  Stable on ppc64
+
+  22 Jan 2006; <dang@gentoo.org> gtkhtml-3.8.2.ebuild:
+  Marked stable on amd64 per bug #119634
+
+  22 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  gtkhtml-3.8.2.ebuild:
+  Marked ppc stable for bug #119634; Stabilize Gnome-2.12.2
+
+  22 Jan 2006; Joshua Jackson <tsunam@gentoo.org> gtkhtml-3.8.2.ebuild:
+  Stable on x86 for bug #119634; Stabilize Gnome-2.12.2
+
+  20 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> gtkhtml-3.8.2.ebuild:
+  Stable on sparc wrt #119634
+
+  12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  gtkhtml-3.2.4.ebuild, gtkhtml-3.2.5.ebuild, gtkhtml-3.6.1.ebuild,
+  gtkhtml-3.6.2.ebuild:
+  Fixing libgtkhtml references
+
+*gtkhtml-3.8.2 (12 Jan 2006)
+*gtkhtml-3.8.1 (12 Jan 2006)
+*gtkhtml-3.6.2 (12 Jan 2006)
+*gtkhtml-3.6.1 (12 Jan 2006)
+*gtkhtml-3.2.5 (12 Jan 2006)
+*gtkhtml-3.2.4 (12 Jan 2006)
+*gtkhtml-3.0.10-r1 (12 Jan 2006)
+*gtkhtml-3.0.10 (12 Jan 2006)
+*gtkhtml-2.6.3 (12 Jan 2006)
+*gtkhtml-2.6.0 (12 Jan 2006)
+
+  12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/libgtkhtml-2.2.0-alpha.patch, +files/gtkhtml-3.0.7-libtool.patch,
+  +files/gtkhtml-3.0.10-no-extern-cluealigned.diff,
+  +files/gtkhtml-3.2-i18n.patch, +files/gtkhtml-3.6.2-fbsd.patch,
+  +files/gtkhtml-fix_preedit.patch, +gtkhtml-2.6.0.ebuild,
+  +gtkhtml-2.6.3.ebuild, +gtkhtml-3.0.10.ebuild, +gtkhtml-3.0.10-r1.ebuild,
+  +gtkhtml-3.2.4.ebuild, +gtkhtml-3.2.5.ebuild, +gtkhtml-3.6.1.ebuild,
+  +gtkhtml-3.6.2.ebuild, +gtkhtml-3.8.1.ebuild, +gtkhtml-3.8.2.ebuild:
+  Moving all gnome-extra/libgtkhtml to gnome-extra/gtkhtml
+
+  12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  gtkhtml-1.1.10-r1.ebuild:
+  Slotting to 1 to allow movement into gnome-extra/libgtkhtml
+
+  28 Nov 2005; Simon Stelling <blubb@gentoo.org> gtkhtml-1.1.10-r1.ebuild:
+  fix multilib-strict issues
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> gtkhtml-1.1.10-r1.ebuild:
+  add ~ia64
+
+  10 Jun 2005; Mark Loeser <halcy0n@gentoo.org> +files/gtkhtml-gcc4.patch,
+  gtkhtml-1.1.10-r1.ebuild:
+  Patch to fix compilation with GCC4
+
+  25 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  gtkhtml-1.1.10-r1.ebuild:
+  Fixing compile problems with gcc-34. Bug #52037
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> gtkhtml-1.1.10.ebuild:
+  fixing depend. see 45343
+
+*gtkhtml-1.1.10-r1 (06 Feb 2004)
+
+  06 Feb 2004; <spider@gentoo.org> :
+  move some things from RDEPEND to DEPEND (intltool, gettext).
+
+  20 Jan 2004; <gustavoz@gentoo.org> gtkhtml-1.1.10.ebuild:
+  stable on sparc
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gtkhtml-1.1.10.ebuild:
+  stable on alpha
+
+  28 Sep 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-1.1.8.ebuild:
+  change gal dep
+
+  16 May 2003; Lars Weiler <pylon@gentoo.org> gtkhtml-1.1.10.ebuild:
+  Set ppc in KEYWORDS
+
+  29 Apr 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-1.1.10.ebuild:
+  bumping to stable
+
+  06 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gtkhtml-1.1.10.ebuild:
+  Fix borkage with "-nls" in USE.
+
+*gtkhtml-1.1.10 (05 Apr 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> gtkhtml-1.1.10.ebuild :
+  Added hppa to KEYWORDS.
+
+  05 Apr 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-1.1.10.ebuild:
+  version bump
+
+*gtkhtml-3.0.1 (13 Mar 2003)
+  
+  21 Mar 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-3.0.1.ebuild:
+  moved to gnome-extra/libgtkhtml-3.0.1
+
+  19 Mar 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-3.0.1.ebuild:
+  changed sources to use gnome.org rather than ximian.com
+
+  13 Mar 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-3.0.1.ebuild:
+  Version Bump and SLOTted.
+
+*gtkhtml-1.1.8 (04 Mar 2003)
+
+  28 Mar 2003; Aron Griffis <agriffis@gentoo.org> gtkhtml-1.1.8.ebuild:
+  Add ~alpha to KEYWORDS
+
+  21 Mar 2003; Jason Wever <weeve@gentoo.org> gtkhtml-1.1.8.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  21 Mar 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-1.1.8.ebuild:
+  marked as stable for x86
+
+  19 Mar 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-1.1.8.ebuild:
+  Force dependency on gal-0.23 to avoid depending on gal-1.99
+  
+  04 Mar 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-1.1.8.ebuild files/digest-gtkhtml-1.1.8 :
+  version bump. bug #16816.
+
+*gtkhtml-1.1.7-r1 (22 Dec 2002)
+
+  04 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  gtkhtml-1.1.7-r1.ebuild :
+
+  Changed to use einstall || die, thanks to a report from KG-awol in
+  #gentoo on freenode.
+
+  24 Jan 2003; foser <foser@gentoo.org> gtkhtml-1.1.7-r1.ebuild :
+  Removed the evolution blocking dep (#13624)
+
+  08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> gtkhtml-1.1.7-r1.ebuild :
+  Mark stable for x86.  Do not install if evo < 1.2.0 are installed.
+
+  24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gtkhtml-1.1.7-r1.ebuild :
+  Fix deps as well for gconf fix (should always depend on gconf)...
+
+  22 Dec 2002; Stefan Jones <cretin@gento.org> :
+  To fix a gconf include dir not found bug.
+
+*gtkhtml-1.1.7 (17 Dec 2002)
+
+  17 Dec 2002; Stefan Jones <cretin@gentoo.org> :
+  New version.
+
+*gtkhtml-1.1.6-r1 (08 Dec 2002)
+                                                                                                   
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> gtkhtml-1.0.4.ebuild, 
+  gtkhtml-1.1.6.ebuild, gtkhtml-1.1.6-r1.ebuild : 
+  Removed sparc64 keyword gtkhtml-1.0.4.ebuild
+  Removed ~sparc64 keyword gtkhtml-1.1.6.ebuild, gtkhtml-1.1.6-r1.ebuild 
+
+  08 Dec 2002; Brandon Low <lostlogic@gentoo.org> gtkhtml-1.1.6-r1.ebuild :
+  Make USE="gnome" be ignored cuz it breaks.
+
+*gtkhtml-1.1.6 (16 Nov 2002)
+
+  18 Nov 2002; foser <foser@gentoo.org> gtkhtml-1.1.6.ebuild :
+  Fixed gal dep (bug #10895)
+
+  16 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.
+
+*gtkhtml-1.1.2 (28 Sep 2002)
+  28 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  New version.  Add gnome.org eclass support.  Libtoolize
+  all of them.  It seems it should be compadible to 1.0,
+  but we will need to do some work to get everything to
+  find the headers (CFLAGS="$CFLAGS -I/usr/include/gtkhtml-1.1" ?).
+
+*gtkhtml-1.0.4 (19 Aug 2002)
+
+  31 Dec 2002; Jon Nall <nall@gentoo.org> gtkhtml-1.0.4.ebuild :
+  added -Os to flags to change to -O2
+
+  15 Dec 2002; Jon Nall <nall@gentoo.org> gtkhtml-1.0.4.ebuild :
+  replace any optimization from -O3 to -O9 with -O2. this fixes bug
+  #11703 where the gtkhtml-editor component asserts during spell
+  check
+
+  15 Sep 2002; Spider <<spider@gentoo.org>> :
+  fix dependency on libglade
+
+  19 Aug 2002; Gabriele Giorgetti <stroke@gentoo.org> gtkhtml-1.0.4.ebuild:
+  New version, and lintool clean.
+
+
+*gtkhtml-1.0.2-r2 (12 Jun 2002)
+  11 Aug 2002; Spider <spider@gentoo.org > gtkhtml-1.0.2-r2.ebuild :
+  fixed gconf and control center dependencies
+  - I want the new dependency spec. now.
+
+  12 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> gtkhtml-1.0.2-r2.ebuild
+     
+  Changed deps to work even if gnome2 packages are unmasked  
+
+*gtkhtml-1.0.2-r1 (11 Apr 2002)
+
+  11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gtkhtml-1.0.2-r1.ebuild
+  files/digest-gtkhtml-1.0.2-r1
+
+  bonobo support has been added back in.
+
+*gtkhtml-1.0.2 (1 Apr 2002)
+
+  1 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gtkhtml-1.0.2.ebuild :
+
+  Version bump, and dependency clean up.  Now bonobo and gconf support are
+  compiled in based on the bonobo and gnome USE flags, respectively
+
+*gtkhtml-1.0.1 (1 Feb 2002)
+
+  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/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
new file mode 100644
index 0000000..4a502ed
--- /dev/null
+++ b/gnome-extra/gtkhtml/Manifest
@@ -0,0 +1,16 @@
+DIST gtkhtml-3.14.2.tar.bz2 1283642 RMD160 80fea3ecf42d2dc56090c8f76c1bc835af8eb089 SHA1 924b4d2a042e520e7e3121870a87b67b2d948a15 SHA256 386e346665cf9ad21b6a35947974823ce187cab1bde60867b84835c1b7e96310
+EBUILD gtkhtml-3.14.2.ebuild 979 RMD160 832b2e1b1ae8c2bc06a0ad1c5cea33e281dce151 SHA1 5248355e1a826cd7793359e62cc022ed1092bc9a SHA256 06c73a7926aefd0d78cb5ec2d151aa8d91fd74750f95a4aecbafd41d9d15444f
+MD5 f1643db5287ddd7a5f96579e4048c15c gtkhtml-3.14.2.ebuild 979
+RMD160 832b2e1b1ae8c2bc06a0ad1c5cea33e281dce151 gtkhtml-3.14.2.ebuild 979
+SHA256 06c73a7926aefd0d78cb5ec2d151aa8d91fd74750f95a4aecbafd41d9d15444f gtkhtml-3.14.2.ebuild 979
+MISC ChangeLog 14472 RMD160 ab7690b7c13b7aec10f3e235f7f496fbf429b2f7 SHA1 7cfc01456fb87c63d3fdcff81e382f4782337518 SHA256 fc4e2c674f9f32a3d0b62cd3a7d1ec800a95455956eca89f7981d0121b1c4d0e
+MD5 03e1f3cb69ea69465489ef87cbf0ca6f ChangeLog 14472
+RMD160 ab7690b7c13b7aec10f3e235f7f496fbf429b2f7 ChangeLog 14472
+SHA256 fc4e2c674f9f32a3d0b62cd3a7d1ec800a95455956eca89f7981d0121b1c4d0e ChangeLog 14472
+MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
+MD5 367e1ac39bb92c1a6f3518fb497980b7 files/digest-gtkhtml-3.14.2 250
+RMD160 1d3d94d258beb4da93035feb9f44c23b0307b688 files/digest-gtkhtml-3.14.2 250
+SHA256 88498798cec2bd2b6155d453f422855cc4a2bfd948cbaf7a335e611aac0f2cbd files/digest-gtkhtml-3.14.2 250
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.14.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.14.2
new file mode 100644
index 0000000..e14084b
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.14.2
@@ -0,0 +1,3 @@
+MD5 7c91fc4e89b77da315f14c8570d56918 gtkhtml-3.14.2.tar.bz2 1283642
+RMD160 80fea3ecf42d2dc56090c8f76c1bc835af8eb089 gtkhtml-3.14.2.tar.bz2 1283642
+SHA256 386e346665cf9ad21b6a35947974823ce187cab1bde60867b84835c1b7e96310 gtkhtml-3.14.2.tar.bz2 1283642
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.14.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.14.2.ebuild
new file mode 100644
index 0000000..e97eb12
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.14.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.1.ebuild,v 1.1 2007/04/16 21:30:30 dang Exp $
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static"
+
+RDEPEND=">=gnome-base/gail-1.1
+	>=gnome-base/libgnomeui-2
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	>=net-libs/libsoup-2.1.6
+	>=x11-libs/pango-1.15.2
+	>=x11-themes/gnome-icon-theme-1.2"
+
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	>=dev-util/intltool-0.35.5
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	G2CONF="$(use_enable static) --enable-file-chooser"
+}
diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
new file mode 100644
index 0000000..da6fd63
--- /dev/null
+++ b/gnome-extra/gtkhtml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>