Moved from net-mail/sylpheed-claws to mail-client/sylpheed-claws.

16 files changed, 1598 insertions, 0 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
new file mode 100644
index 000000000000..9bdea4d80ccf
--- /dev/null
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -0,0 +1,390 @@
+# ChangeLog for net-mail/sylpheed-claws
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.1 2004/05/30 03:05:56 seemant Exp $
+
+*sylpheed-claws-0.9.9 (29 May 2004)
+
+  29 May 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
+  +files/gv-procmime-Makefile.in.patch, +files/procmime.patch,
+  +files/sylpheed-0.8.3claws32-dillo.patch, +sylpheed-claws-0.9.10.ebuild,
+  +sylpheed-claws-0.9.5-r1.ebuild, +sylpheed-claws-0.9.7.ebuild,
+  +sylpheed-claws-0.9.8.ebuild, +sylpheed-claws-0.9.9.ebuild:
+  Moved from net-mail/sylpheed-claws to mail-client/sylpheed-claws.
+
+  23 May 2004; Danny van Dyk <kugelfang@gentoo.org>
+  sylpheed-claws-0.9.10.ebuild:
+  Marked ~amd64.
+
+  17 Apr 2004; Jason Wever <weeve@gentoo.org> sylpheed-claws-0.9.10.ebuild:
+  Stable on sparc.
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  sylpheed-claws-0.9.5-r1.ebuild:
+  don't use deprecated ? : use syntax
+
+  11 Mar 2004; Jason Wever <weeve@gentoo.org> sylpheed-claws-0.9.9.ebuild:
+  Stable on sparc.
+
+*sylpheed-claws-0.9.10 (08 Mar 2004)
+
+  08 Mar 2004; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.10.ebuild,
+  sylpheed-claws-0.9.5-r1.ebuild, sylpheed-claws-0.9.9.ebuild:
+  version bump, marking 0.9.9 stable on x86
+
+*sylpheed-claws-0.9.9 (09 Feb 2004)
+
+  09 Feb 2004; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.9.ebuild:
+  version bump
+
+  16 Jan 2004; Marius Mauch <genone@gentoo.org>
+  sylpheed-claws-0.8.11.ebuild, sylpheed-claws-0.9.0-r1.ebuild, 
+  sylpheed-claws-0.9.5.ebuild, sylpheed-claws-0.9.6-r1.ebuild, 
+  sylpheed-claws-0.9.6.ebuild, sylpheed-claws-0.9.7.ebuild,
+  sylpheed-claws-0.9.8.ebuild:
+  adding metamail dependency, thanks to Keith Edmunds <keith@midnighthax.com>
+  for pointing that out (closing bug 37090). Removing old versions. Changing
+  some DEPENDs to RDEPEND in 0.9.8
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  sylpheed-claws-0.9.7.ebuild:
+  set ppc in keywords
+
+  07 Jan 2004; Jason Wever <weeve@gentoo.org> sylpheed-claws-0.9.7.ebuild:
+  Marked stable on sparc, resolves #35970 for sparc.
+
+*sylpheed-claws-0.9.8 (20 Dec 2003)
+
+  20 Dec 2003; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.8.ebuild:
+  version bump
+
+  16 Dec 2003; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.8.11.ebuild,
+  sylpheed-claws-0.9.0-r1.ebuild, sylpheed-claws-0.9.5-r1.ebuild,
+  sylpheed-claws-0.9.5.ebuild, sylpheed-claws-0.9.6-r1.ebuild,
+  sylpheed-claws-0.9.6.ebuild, sylpheed-claws-0.9.7.ebuild:
+  marking 0.9.7 stable on x86, removing ~mips and ~hppa as dependencies are 
+  broken on these archs
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  sylpheed-claws-0.9.5-r1.ebuild, sylpheed-claws-0.9.5.ebuild,
+  sylpheed-claws-0.9.6-r1.ebuild, sylpheed-claws-0.9.6.ebuild,
+  sylpheed-claws-0.9.7.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  29 Nov 2003; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.7.ebuild,
+  files/gv-procmime-0.9.7.diff, files/gv-procmime-Makefile.in.patch:
+  changing order of include paths, closing bug 34519, thanks to ocastan@noos.fr
+  for the fix. Removing postinst message about plugins (it's old).
+
+*sylpheed-claws-0.9.7 (26 Nov 2003)
+
+  26 Nov 2003; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.7.ebuild,
+  files/gv-procmime-0.9.7.diff:
+  - version bump 
+  - adding configure option for compface 
+  - re-enabling option for clamav plugin 
+  - replacing 
+  		use xxx && myconf="--enable-xxx" || myconf="--disable-xxx"
+	with 
+		myconf=`use_enable xxx`
+
+  12 Nov 2003; Marius Mauch <genone@gentoo.org> metadata.xml,
+  sylpheed-claws-0.9.5-r1.ebuild, sylpheed-claws-0.9.5.ebuild,
+  sylpheed-claws-0.9.6-r1.ebuild, sylpheed-claws-0.9.6.ebuild:
+  fixed SRC_URI, added maintainers to metadata.xml
+
+*sylpheed-claws-0.9.6-r2 (10 Nov 2003)
+
+  10 Nov 2003; Greg Fitzgerald <gregf@gentoo.org>
+  sylpheed-claws-0.9.6-r2.ebuild:
+  fixed gettext version
+
+  10 Nov 2003; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.9.4-r1.ebuild, sylpheed-claws-0.9.4.ebuild,
+  sylpheed-claws-0.9.6-r1.ebuild:
+  Fix ghostviewer plugin compile process to compile against the unpacked sources
+  rather than an already installed instance of sylpheed-claws -- which will
+  break if compiling -claws for the first time. Closes bug #32503 by Steve
+  Arnold <nerdboy@gentoo.org>
+
+*sylpheed-claws-0.9.6-r1 (28 Oct 2003)
+  28 Oct 2003; Seemant Kulleen <seemant@gentoo.org> :
+  update the ghostviewer plugin to 0.5 and create a dillo local USE setting for
+  the dillo plugin. The latter closes bug #31963 by Dirk Salewski
+  <mail@dslinux.net>
+
+*sylpheed-claws-0.9.6 (02 Oct 2003)
+
+  02 Oct 2003; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.9.6.ebuild:
+  version bump
+
+*sylpheed-claws-0.9.5-r1 (26 Sep 2003)
+
+  26 Sep 2003; Marius Mauch <genone@gentoo.org>
+  sylpheed-claws-0.9.5-r1.ebuild:
+  disabling some non-working options if USE=gtk2 is set
+
+  06 Sep 2003; Jason Wever <weeve@gentoo.org> sylpheed-claws-0.9.0-r1.ebuild:
+  Marked stable on sparc.
+
+  06 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.9.4-r1.ebuild, sylpheed-claws-0.9.4.ebuild:
+  gettext-0.12 is required
+
+  06 Sep 2003; Karl Trygve Kalleberg <karltk@gentoo.org>
+  sylpheed-claws-0.9.4-r1.ebuild:
+  Won't compile without gettext-0.12 or newer, added proper dep. Also, DEPEND
+  and RDEPEND were slightly off, so I merged them all.
+
+  06 Sep 2003; Karl Trygve Kalleberg <karltk@gentoo.org>
+  sylpheed-claws-0.9.4.ebuild:
+  Won't compile without gettext-0.12 or newer, added proper dep.
+
+*sylpheed-claws-0.9.4-r1 (06 Sep 2003)
+
+  06 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.9.4-r1.ebuild:
+  added the ghostviewer plugin. Should close bug #22827 by: Marius Mauch
+  <genone@genone.de>
+
+  30 Aug 2003; Alastair Tse <liquidx@gentoo.org> sylpheed-claws-0.8.11.ebuild,
+  sylpheed-claws-0.9.0-r1.ebuild, sylpheed-claws-0.9.0.ebuild,
+  sylpheed-claws-0.9.3.ebuild, sylpheed-claws-0.9.4.ebuild:
+  moving app-misc/jpilot to app-pda/jpilot
+
+*sylpheed-claws-0.9.4 (07 Aug 2003)
+
+  07 Aug 2003; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.9.4.ebuild:
+  Version bump.
+
+*sylpheed-claws-0.9.3 (12 Jul 2003)
+
+  12 Jul 2003; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.9.3.ebuild:
+  Version bump.
+
+  14 Jun 2003; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.9.0-r1.ebuild:
+  Enabled tray icon plugin
+
+*sylpheed-claws-0.9.0-r1 (07 Jun 2003)
+
+  07 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.9.0-r1.ebuild:
+  Extra tools are now installed into /usr/lib/sylpheed-claws/tools. Closes bug
+  #22138 by Marius Mauch <genone@genone.de>
+
+*sylpheed-claws-0.9.0 (25 May 2003)
+
+  25 May 2003; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.9.0.ebuild:
+  version bump
+
+  16 Apr 2003; Luca Barbato <lu_zero@gentoo.org> procmime.patch:
+  fixed the mime parser
+
+*sylpheed-claws-0.8.11 (12 Mar 2003)
+
+  22 Apr 2003; Graham Forest <vladimir@gentoo.org>
+  sylpheed-claws-0.8.10.ebuild, sylpheed-claws-0.8.11.ebuild,
+  sylpheed-claws-0.8.3.ebuild, sylpheed-claws-0.8.5.ebuild,
+  sylpheed-claws-0.8.9.ebuild:
+  app-text/aspell -> virtual/aspell-dict
+
+  31 Mar 2003; Jason Wever <weeve@gentoo.org> sylpheed-claws-0.8.11.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  22 Mar 2003; Graham Forest <vladimir@gentoo.org>
+  sylpheed-claws-0.8.11.ebuild:
+  set ppc in keywords
+
+  12 Mar 2003; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.8.11.ebuild, 
+  files/digest-sylpheed-claws-0.8.11 :
+  
+  Version bump.
+
+*sylpheed-claws-0.8.10 (13 Feb 2003)
+
+  13 Feb 2003; Seemant Kulleen <seemant@gentoo.org> sylpheed-claws-0.8.10.ebuild sylpheed-claws-0.8.9.ebuild files/digest-sylpheed-claws-0.8.10 :
+  Version bump thanks to Hanno
+
+*sylpheed-claws-0.8.9 (26 Jan 2003)
+
+  26 Jan 2003; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.8.9.ebuild,
+  files/digest-sylpheed-claws-0.8.9:
+  
+  Version bump, with many bugfixes and feature enhancements including new plugin support,
+  with a built in spamassassin plugin :). To use the plugins you will need to load 
+  them Go to '/Configuration/Plugins' and click 'Load plugin', then select the 
+  plugin SpamAssassin usr/lib/sylpheed-claws/plugins/spamassassin.so, SpamAssassin GTK
+  usr/lib/sylpheed/plugins/spamassassin_gtk.so To configure the SpamAssassin 
+  plugin go to the new Preferences window, '/Configuration/Other Preferences', 
+  and select /Filtering/SpamAssassin.
+  
+  
+*sylpheed-claws-0.8.8-r1 (10 Jan 2003)
+
+  10 Jan 2003; Luca Barbato <lu_zero@gentoo.org> sylpheed-claws-0.8.8-r1.ebuild,
+  files/digest-sylpheed-claws-0.8.8-r1, files/procmime.patch:
+  
+  Make it use shared-mime-info
+
+*sylpheed-claws-0.8.8 (26 Dec 2002)
+  
+  08 Jan 2003; Brad Cowan <bcowan@gentoo.org>:
+  Added depend on mime-types, fixes bug #13412.
+
+
+  1 Jan 2003; Martin Schlemmer <azarah@gentoo.org> sylpheed-claws-0.8.8.ebuild :
+
+  Fix Gnome .desktop having no data; moved it to sylpheed-claws; Also change
+  menu entry name to sylpheed-claws.
+
+  26 Dec 2002; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.8.8.ebuild,
+  files/digest-sylpheed-claws-0.8.8:
+
+  Version bump, fixes mime issue.
+
+*sylpheed-claws-0.8.7 (23 Dec 2002)
+
+  23 Dec 2002; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.8.7.ebuild,
+  files/digest-sylpheed-claws-0.8.7:
+
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*sylpheed-claws-0.8.6 (26 Nov 2002)
+
+  26 Nov 2002; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.8.6.ebuild,
+  files/digest-sylpheed-claws-0.8.6:
+
+  Version bump.
+
+*sylpheed-claws-0.8.5 (09 Oct 2002)
+
+  25 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> sylpheed-claws-0.8.5.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  12 Oct 2002; Bruce A. Locke <blocke@shivan.org> sylpheed-claws-0.8.5.ebuild:
+  Ebuild now installs README files, etc.
+
+  09 Oct 2002; Brad Cowan <bcowan@gentoo.org> sylpheed-claws-0.8.5.ebuild,
+  files/digest-sylpheed-claws-0.8.5:
+  
+  Version bump with minor bugfixes.
+
+*sylpheed-claws-0.8.3 (24 Sep 2002)
+  
+  24 Sep 2002; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.8.3.ebuild files/digest-sylpheed-claws-0.8.3 :
+
+  Version bump which fixes more memory leaks and sorts out the aspell issue.
+  Thanks to: moixa@gmx.ch (Tobias Sager) in bug #8218 and
+  bradlyatc@cowancomputers.com (Brad Cowan) in bug #8249.
+
+*sylpheed-claws-0.8.2 (28 Aug 2002)
+
+  6 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  28 Aug 2002; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.8.2.ebuild files/digest-sylpheed-claws-0.8.2 :
+
+  Version bump which fixes many memory leaks.  The dillo and aspell patches
+  are still applied on this release as well.  Thanks to: hanno@gmx.de (Hanno
+  Boeck) in bug #7166
+
+*sylpheed-claws-0.8.1-r1 (17 Aug 2002)
+
+  17 Aug 2002; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.8.1-r1.ebuild files/digest-sylpheed-claws-0.8.1-r1 :
+
+  Jared Hudson (jhhudso@gentoo.org) fixed up the
+  embeddable-dillo-within-sylpheed patch from
+  http://melvin.hadasht.free.fr/home/dillo/sylpheed/ so that it actually
+  works now.  In order to see HTML in e-mails, emerge sylpheed-claws with
+  the "gtkhtml" USE flag enabled.  Also, this release has a patch by me to
+  make it work with aspell-0.50*
+
+*sylpheed-claws-0.8.1 (30 Jul 2002)
+
+  30 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.8.1.ebuild files/digest-sylpheed-claws-0.8.1 :
+
+  Version bump.
+
+*sylpheed-claws-0.8.0 (24 Jul 2002)
+
+  24 Jul 2002; Seemant Kulleen <seemant@gentoo.org> sylpheed-claws-0.8.0 :
+
+  Version bump, thanks to: hanno@gmx.de (Hanno Boeck) in bug #5505
+
+*sylpheed-claws-0.7.8-r1 (29 Jun 2002)
+
+  29 Jun 2002; Seemant Kulleen <seemant@gentoo.org> sylpheed-claws-0.7.8-r1
+  files/digest-sylpheed-claws-0.7.8-r1 :
+
+  PROVIDEs virtual/sylpheed
+
+*sylpheed-claws-0.7.8 (16 Jun 2002)
+
+  16 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.7.8.ebuild files/digest-sylpheed-claws-0.7.8 :
+
+  Version bump thanks to hanno@gmx.de (Hanno Boeck) in bug #3781
+
+*sylpheed-claws-0.7.6 (19 May 2002)
+
+  19 May 2002; Seemant Kulleen <seemant@gentoo.org>
+  sylpheed-claws-0.7.6.ebuild files/digest-sylpheed-claws-0.7.6 :
+
+  Version bump.
+
+*sylpheed-claws-0.7.5 (28 Apr 2002)
+
+  28 Apr 2002; Seemant Kulleen <seemant@gentoo.org> sylpheed-claws-0.7.5.ebuild
+  files/digest-sylpheed-claws-0.7.5 :
+
+  Version bump.
+
+*sylpheed-claws-0.7.4-r2 (15 Apr 2002)
+
+  15 Apr 2002; Seemant Kulleen <seemant@gentoo.org> sylpheed-claws-0.7.4-r2.ebuild :
+
+  Changed the gpg USE flag to the USE flag crypt instead, which is more general.
+
+*sylpheed-claws-0.7.4-r2 (10 Apr 2002)
+
+  10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sylpheed-claws-0.7.4-r2.ebuild files/digest-sylpheed-claws-0.7.4-r2:
+
+  Can now coexist with normal sylpheed. Binary renamed to sylpheed-claws.
+
+  Removed sylpheed-claws-0.7.4-r1.ebuild files/digest-sylpheed-claws-0.7.4-r1
+
+*sylpheed-claws-0.7.4 ( 12 Mar 2002 )
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> sylpheed-claws-0.7.4-r1.ebuild
+
+  Uses gpg USE flag instead of gpgme.
+
+*sylpheed-claws-0.7.4 ( 12 Mar 2002 )
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> sylpheed-claws-0.7.4.ebuild
+
+  Simple copy of 0.7.4 ebuild but with the additional checks for nls in USE.
+
+*sylpheed-claws-0.7.2 ( 22 Feb 2002 )
+
+  22 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog files/digest-sylpheed-claws-0.7.2 sylpheed-claws-0.7.2:
+  
+  Updated version. Simple copy of Karl's 0.7.1 ebuild with Description added.
+
+*sylpheed-claws-0.7.1 ( 18 Feb 2002 )
+
+  22 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog,  sylpheed-claws-0.7.1:
+
+  Added Description to ebuild.
+  
+  18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog files/digest-sylpheed-claws-0.7.1 sylpheed-claws-0.7.1:
+  
+  A bleeding-edge fork off the Sylpheed main branch.
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
new file mode 100644
index 000000000000..633acbb65295
--- /dev/null
+++ b/mail-client/sylpheed-claws/Manifest
@@ -0,0 +1,15 @@
+MD5 8cf78bb2dfe0f0009224f878716a67ed sylpheed-claws-0.9.7.ebuild 4668
+MD5 60310896e3299e746d3aad6af09a90a9 sylpheed-claws-0.9.5-r1.ebuild 4651
+MD5 0ee91fab1afde8b0c7e762f2f1157943 sylpheed-claws-0.9.9.ebuild 3750
+MD5 a00f4c04f0788312c9e3f94961ac7710 sylpheed-claws-0.9.10.ebuild 3762
+MD5 2fdd799a3c987f818066659a59a00c1e sylpheed-claws-0.9.8.ebuild 4656
+MD5 ddae89459ccc6ffe139e0bf512676a70 ChangeLog 13337
+MD5 799733f5421ef60964d6df8062dfc7b3 metadata.xml 345
+MD5 a44580928f3fa901eb944e739c070d44 files/digest-sylpheed-claws-0.9.7 148
+MD5 7e4997657b4184182e39ad72ff9d1a01 files/digest-sylpheed-claws-0.9.8 148
+MD5 0c86a50615c61f5a6d26d90b598e898e files/digest-sylpheed-claws-0.9.9 148
+MD5 e5a1953a555e8060722cada98b9d55fb files/digest-sylpheed-claws-0.9.10 149
+MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
+MD5 82d3d3968bf15e87b2fc7b5b53c42277 files/gv-procmime-Makefile.in.patch 930
+MD5 1e7e11ae4e8aba685f25aa113e70e1b5 files/digest-sylpheed-claws-0.9.5-r1 234
+MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.10 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.10
new file mode 100644
index 000000000000..8d9547bb7111
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.10
@@ -0,0 +1,2 @@
+MD5 53c3f65afe8e1c96e07bf33c7f76ef5a sylpheed-0.9.10claws.tar.bz2 2969973
+MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.5-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.5-r1
new file mode 100644
index 000000000000..c59414830083
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.5-r1
@@ -0,0 +1,3 @@
+MD5 66d72383222e4deb47300889d24f1044 sylpheed-0.9.5claws.tar.bz2 2733738
+MD5 260f8e031f2b336e2554f58d70313cf2 sylpheed-0.9.5claws-gtk2-20030917.diff.gz 151042
+MD5 3cb2d0e1cf2cd49ac51e6223e5cf4f33 ghostscript-viewer-0.4.tar.bz2 184684
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.7 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
new file mode 100644
index 000000000000..0be386fe6ad2
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
@@ -0,0 +1,2 @@
+MD5 a46fdb6abb3faec84660e58ccf96e869 sylpheed-0.9.7claws.tar.bz2 2846105
+MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.8 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.8
new file mode 100644
index 000000000000..4b19fa227b11
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.8
@@ -0,0 +1,2 @@
+MD5 e0ed997b1facb067061876df20472e8e sylpheed-0.9.8claws.tar.bz2 2866881
+MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.9 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.9
new file mode 100644
index 000000000000..ff7ee8f4cd0b
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.9
@@ -0,0 +1,2 @@
+MD5 9068192f009fb8240be6e9222ff27999 sylpheed-0.9.9claws.tar.bz2 2960914
+MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/files/gv-procmime-Makefile.in.patch b/mail-client/sylpheed-claws/files/gv-procmime-Makefile.in.patch
new file mode 100644
index 000000000000..fbe11c8c7e1f
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/gv-procmime-Makefile.in.patch
@@ -0,0 +1,16 @@
+--- sylpheed-0.9.7claws.old/src/plugins/ghostscript-viewer-0.5/src/Makefile.in	2003-11-27 19:18:13.000000000 +0100
++++ sylpheed-0.9.7claws/src/plugins/ghostscript-viewer-0.5/src/Makefile.in	2003-11-27 19:19:32.000000000 +0100
+@@ -189,10 +189,10 @@
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plugin.Plo ./$(DEPDIR)/viewer.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/viewerprefs.Plo
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(INCLUDES) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/mail-client/sylpheed-claws/files/procmime.patch b/mail-client/sylpheed-claws/files/procmime.patch
new file mode 100644
index 000000000000..5743931caf1d
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/procmime.patch
@@ -0,0 +1,35 @@
+--- procmime.c.orig	2003-01-10 01:21:35.000000000 +0100
++++ procmime.c	2003-01-10 02:19:06.000000000 +0100
+@@ -1187,7 +1187,7 @@
+ 
+ 	if (mime_type_list) 
+ 		return mime_type_list;
+-
++	if ((fp = fopen("/usr/share/mime/globs", "rb")) == NULL) 
+ 	if ((fp = fopen("/etc/mime.types", "rb")) == NULL) {
+ 		if ((fp = fopen(SYSCONFDIR "/mime.types", "rb")) == NULL) {
+ 			FILE_OP_ERROR(SYSCONFDIR "/mime.types", "fopen");
+@@ -1201,11 +1201,12 @@
+ 		g_strstrip(buf);
+ 
+ 		p = buf;
+-		while (*p && !isspace(*p)) p++;
++		while (*p && !isspace(*p)&& (*p!=':')) p++;
+ 		if (*p) {
+ 			*p = '\0';
+ 			p++;
+ 		}
++		g_print("%s ",buf);
+ 		delim = strchr(buf, '/');
+ 		if (delim == NULL) continue;
+ 		*delim = '\0';
+@@ -1214,7 +1215,8 @@
+ 		mime_type->type = g_strdup(buf);
+ 		mime_type->sub_type = g_strdup(delim + 1);
+ 
+-		while (*p && isspace(*p)) p++;
++		while (*p && (isspace(*p)||(*p=='*')||(*p=='.'))) p++;
++		g_print("%s\n",p);
+ 		if (*p)
+ 			mime_type->extension = g_strdup(p);
+ 		else
diff --git a/mail-client/sylpheed-claws/files/sylpheed-0.8.3claws32-dillo.patch b/mail-client/sylpheed-claws/files/sylpheed-0.8.3claws32-dillo.patch
new file mode 100644
index 000000000000..0868c1da8ebc
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/sylpheed-0.8.3claws32-dillo.patch
@@ -0,0 +1,292 @@
+diff -r -c sylpheed-0.8.3claws.orig/src/messageview.c sylpheed-0.8.3claws/src/messageview.c
+--- sylpheed-0.8.3claws.orig/src/messageview.c	23 Aug 2002 06:52:15 	
++++ sylpheed-0.8.3claws/src/messageview.c	29 Sep 2002 08:16:45 
+@@ -120,6 +120,7 @@ MessageView *messageview_create(MainWind
+ 	messageview->textview   = textview;
+ 	messageview->imageview  = imageview;
+ 	messageview->mimeview   = mimeview;
++	messageview->plugview   = gtk_socket_new();
+ 	messageview->noticeview = noticeview;
+ 
+ 	return messageview;
+@@ -458,8 +459,8 @@ void messageview_show(MessageView *messa
+ 	textview_set_all_headers(messageview->textview, all_headers);
+ 	textview_set_all_headers(messageview->mimeview->textview, all_headers);
+ 
+-	if (mimeinfo->mime_type != MIME_TEXT &&
+-	    mimeinfo->mime_type != MIME_TEXT_HTML) {
++	if (mimeinfo->mime_type != MIME_TEXT /*&&
++	    mimeinfo->mime_type != MIME_TEXT_HTML*/) {
+ 		messageview_change_view_type(messageview, MVIEW_MIME);
+ 		mimeview_show_message(messageview->mimeview, mimeinfo, file);
+ 	} else {
+@@ -481,29 +482,51 @@ static void messageview_change_view_type
+ {
+ 	TextView *textview = messageview->textview;
+ 	MimeView *mimeview = messageview->mimeview;
++	GtkWidget *plugview = messageview->plugview;
+ 
+ 	if (messageview->type == type) return;
+ 
+ 	if (type == MVIEW_MIME) {
+-		gtkut_container_remove
+-			(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
+-			 GTK_WIDGET_PTR(textview));
++		if (messageview->type == MVIEW_TEXT)
++			gtkut_container_remove
++				(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
++				 GTK_WIDGET_PTR(textview));
++		else if (messageview->type == MVIEW_PLUG)
++			gtkut_container_remove
++				(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
++				 GTK_WIDGET_PTR(plugview));
+ 		gtk_box_pack_start(GTK_BOX(messageview->vbox),
+ 				   GTK_WIDGET_PTR(mimeview), TRUE, TRUE, 0);
+ 		gtk_container_add(GTK_CONTAINER(mimeview->vbox),
+ 				  GTK_WIDGET_PTR(textview));
+ 	} else if (type == MVIEW_TEXT) {
+-		gtkut_container_remove
+-			(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
+-			 GTK_WIDGET_PTR(mimeview));
+-
++		if (messageview->type == MVIEW_MIME)
++			gtkut_container_remove
++				(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
++				 GTK_WIDGET_PTR(mimeview));
++		else if (messageview->type == MVIEW_PLUG)
++			gtkut_container_remove
++				(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
++				 GTK_WIDGET_PTR(plugview));
++ 
+ 		if (mimeview->vbox == GTK_WIDGET_PTR(textview)->parent)
+ 			gtkut_container_remove(GTK_CONTAINER(mimeview->vbox),
+ 			 		       GTK_WIDGET_PTR(textview));
+ 
+ 		gtk_box_pack_start(GTK_BOX(messageview->vbox),
+ 				   GTK_WIDGET_PTR(textview), TRUE, TRUE, 0);
+-	} else
++	} else if (type == MVIEW_PLUG) {
++		if (messageview->type == MVIEW_MIME)
++			gtkut_container_remove
++				(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
++				 GTK_WIDGET_PTR(mimeview));
++		else if (messageview->type == MVIEW_TEXT)
++			gtkut_container_remove
++				(GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
++				 GTK_WIDGET_PTR(textview));
++		gtk_box_pack_start(GTK_BOX(messageview->vbox),
++				   GTK_WIDGET_PTR(plugview), TRUE, TRUE, 0);
++ 	} else
+ 		return;
+ 
+ 	messageview->type = type;
+@@ -528,6 +551,7 @@ void messageview_destroy(MessageView *me
+ 	textview_destroy(messageview->textview);
+ 	imageview_destroy(messageview->imageview);
+ 	mimeview_destroy(messageview->mimeview);
++	gtk_widget_destroy(messageview->plugview);
+ 	noticeview_destroy(messageview->noticeview);
+ 
+ 	g_free(messageview);
+
+diff -r -c sylpheed-0.8.3claws.orig/src/messageview.h sylpheed-0.8.3claws/src/messageview.h
+--- sylpheed-0.8.3claws.orig/src/messageview.h	23 Aug 2002 06:52:15 	
++++ sylpheed-0.8.3claws/src/messageview.h	29 Sep 2002 08:16:45 
+@@ -36,7 +36,8 @@ typedef struct _MessageView	MessageView;
+ typedef enum
+ {
+ 	MVIEW_TEXT,
+-	MVIEW_MIME
++	MVIEW_MIME,
++	MVIEW_PLUG
+ } MessageType;
+ 
+ struct _MessageView
+@@ -51,6 +52,7 @@ struct _MessageView
+ 	TextView *textview;
+ 	ImageView *imageview;
+ 	MimeView *mimeview;
++	GtkWidget *plugview;
+ 	NoticeView *noticeview;
+ 
+ 	MainWindow *mainwin;
+
+diff -r -c sylpheed-0.8.3claws.orig/src/mimeview.c sylpheed-0.8.3claws/src/mimeview.c
+--- sylpheed-0.8.3claws.orig/src/mimeview.c	22 Sep 2002 10:53:49
++++ sylpheed-0.8.3claws/src/mimeview.c	29 Sep 2002 08:16:45 
+@@ -25,6 +25,7 @@
+ 
+ #include <glib.h>
+ #include <gdk/gdkkeysyms.h>
++#include <gdk/gdkx.h>
+ #include <gtk/gtknotebook.h>
+ #include <gtk/gtkscrolledwindow.h>
+ #include <gtk/gtkctree.h>
+@@ -53,7 +54,6 @@
+ #include "prefs_common.h"
+ #include "rfc2015.h"
+ #include "pgptext.h"
+-
+ typedef enum
+ {
+ 	COL_MIMETYPE = 0,
+@@ -215,6 +215,7 @@ MimeView *mimeview_create(void)
+ 	mimeview->popupmenu    = popupmenu;
+ 	mimeview->popupfactory = popupfactory;
+ 	mimeview->type         = -1;
++	mimeview->plugview     = NULL;
+ 
+ 	return mimeview;
+ }
+@@ -346,6 +347,10 @@ void mimeview_show_message(MimeView *mim
+ void mimeview_destroy(MimeView *mimeview)
+ {
+ 	procmime_mimeinfo_free_all(mimeview->mimeinfo);
++	if (mimeview->plugview) {
++		printf("MIMVIEW destroyg %08x\n", mimeview->plugview);
++		gtk_widget_destroy(mimeview->plugview);
++	}
+ 	g_free(mimeview->file);
+ 	g_free(mimeview);
+ }
+@@ -472,13 +477,67 @@ static void mimeview_show_image_part(Mim
+ 	g_free(filename);
+ }
+ 
++static gint plugview_destroyed(GtkObject *o, gpointer data)
++{
++	MimeView *m = (MimeView *) data;
++	printf("Destroy thingie %08x  (%08x)\n", m->plugview, o);
++	m->plugview = NULL;
++	return TRUE;
++}
++
++static void mimeview_show_dillo_part(MimeView *mimeview, MimeInfo *partinfo)
++{
++	gchar *filename;
++
++	if (!partinfo) return;
++
++	filename = procmime_get_tmp_file_name(partinfo);
++
++	if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
++		alertpanel_error
++			(_("Can't get the part of multipart message."));
++	else {
++		gchar *cmd;
++		/* Workaround for the GTK+ bug with handling scroll adjustments
++		 * in GtkViewport */
++		if (mimeview->plugview)
++			if (GTK_SOCKET(mimeview->plugview)->plug_window) {
++				gtk_widget_destroy(mimeview->plugview);
++				printf("Destroyed %08x\n", mimeview->plugview);
++				mimeview->plugview = NULL;
++			}
++		if (!mimeview->plugview) {
++			mimeview->plugview = gtk_socket_new();
++			printf("Created %08x\n", mimeview->plugview);
++			gtk_signal_connect(GTK_OBJECT(mimeview->plugview), 
++					"destroy", 
++					GTK_SIGNAL_FUNC(plugview_destroyed),
++					mimeview);
++		}
++		mimeview_change_view_type(mimeview, MIMEVIEW_PLUG);
++		printf("SHowing %08x\n", mimeview->plugview);
++		gtk_widget_show(mimeview->plugview);
++		gtk_widget_realize(mimeview->plugview);
++
++		cmd = g_strdup_printf("dillo -f -l -x %d \"%s\"", 
++				GDK_WINDOW_XWINDOW(mimeview->plugview->window),
++				filename);
++		execute_command_line(cmd, TRUE);
++		g_free(cmd);
++		/*unlink(filename);*/
++	}
++
++	g_free(filename);
++}
+ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
+ {
+ 	TextView  *textview  = mimeview->textview;
+ 	ImageView *imageview = mimeview->imageview;
++	GtkWidget *plugview  = mimeview->plugview;
+ 	GList *children;
+ 
+-	if (mimeview->type == type) return;
++	if (mimeview->type == type && type != MIMEVIEW_PLUG) return;
++	printf("Changing... to ");
+ 
+ 	children = gtk_container_children(GTK_CONTAINER(mimeview->mime_vbox));
+ 	if (children) {
+@@ -489,10 +548,17 @@ static void mimeview_change_view_type(Mi
+ 
+ 	switch (type) {
+ 	case MIMEVIEW_IMAGE:
++		printf("Changing... to IMAGE\n");
+ 		gtk_container_add(GTK_CONTAINER(mimeview->mime_vbox),
+ 				  GTK_WIDGET_PTR(imageview));
+ 		break;
++	case MIMEVIEW_PLUG:
++		printf("Changing... to PLUG\n");
++		gtk_container_add(GTK_CONTAINER(mimeview->mime_vbox),
++				  mimeview->plugview);
++		break;
+ 	case MIMEVIEW_TEXT:
++		printf("Changing... to TEXT\n");
+ 		gtk_container_add(GTK_CONTAINER(mimeview->mime_vbox),
+ 				  GTK_WIDGET_PTR(textview));
+ 		break;
+@@ -509,7 +575,11 @@ static void mimeview_clear(MimeView *mim
+ 
+ 	procmime_mimeinfo_free_all(mimeview->mimeinfo);
+ 	mimeview->mimeinfo = NULL;
+-
++	
++	printf("Clearing...\n");
++	if (mimeview->plugview)
++		gtk_widget_destroy(mimeview->plugview);
++	
+ 	gtk_clist_clear(clist);
+ 	textview_clear(mimeview->textview);
+ 	imageview_clear(mimeview->imageview);
+@@ -545,7 +615,7 @@ static void mimeview_selected(GtkCTree *
+ 	
+ 	switch (partinfo->mime_type) {
+ 	case MIME_TEXT:
+-	case MIME_TEXT_HTML:
++	/*case MIME_TEXT_HTML:*/
+ 	case MIME_TEXT_ENRICHED:
+ 	case MIME_MESSAGE_RFC822:
+ 	case MIME_MULTIPART:
+@@ -563,6 +633,9 @@ static void mimeview_selected(GtkCTree *
+ 		}
+ 		break;
+ #endif
++	case MIME_TEXT_HTML:
++		mimeview_show_dillo_part(mimeview, partinfo);
++		break;
+ 	default:
+ 		mimeview->textview->default_text = TRUE;	
+ 		mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+
+diff -r -c sylpheed-0.8.3claws.orig/src/mimeview.h sylpheed-0.8.3claws/src/mimeview.h
+--- sylpheed-0.8.3claws.orig/src/mimeview.h	22 Sep 2002 10:53:44
++++ sylpheed-0.8.3claws/src/mimeview.h	29 Sep 2002 08:16:45 
+@@ -35,7 +35,8 @@ typedef struct _MimeView	MimeView;
+ typedef enum
+ {
+ 	MIMEVIEW_TEXT,
+-	MIMEVIEW_IMAGE
++	MIMEVIEW_IMAGE,
++	MIMEVIEW_PLUG
+ } MimeViewType;
+ 
+ struct _MimeView
+@@ -57,6 +58,7 @@ struct _MimeView
+ 
+ 	TextView *textview;
+ 	ImageView *imageview;
++	GtkWidget *plugview;
+ 
+ 	MessageView *messageview;
+ 
diff --git a/mail-client/sylpheed-claws/metadata.xml b/mail-client/sylpheed-claws/metadata.xml
new file mode 100644
index 000000000000..134921a8fa3e
--- /dev/null
+++ b/mail-client/sylpheed-claws/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<maintainer>
+	<email>genone@gentoo.org</email>
+</maintainer>
+<maintainer>
+	<email>seemant@gentoo.org</email>
+</maintainer>
+<maintainer>
+	<email>bcowan@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.10.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.10.ebuild
new file mode 100644
index 000000000000..18becedf802e
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.10.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.10.ebuild,v 1.1 2004/05/30 03:05:56 seemant Exp $
+
+IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
+
+inherit eutils
+
+GS_PN=ghostscript-viewer
+GS_PV=0.6
+MY_GS=${GS_PN}-${GS_PV}
+MY_P="sylpheed-${PV}claws"
+S=${WORKDIR}/${MY_P}
+S2=${S}/src/plugins/${MY_GS}
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc sparc ~alpha ~amd64"
+
+DEPEND=">=sys-apps/sed-4
+	=x11-libs/gtk+-1.2*
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
+	dillo? ( net-www/dillo )
+	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
+	imlib? ( >=media-libs/imlib-1.9.10 )
+	spell? ( virtual/aspell-dict )
+	xface? ( >=media-libs/compface-1.4 )
+	pdflib? ( virtual/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	net-mail/metamail
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+src_unpack() {
+	unpack ${A}
+
+	mv ${WORKDIR}/${MY_GS} ${S}/src/plugins
+
+	# Change package name to sylpheed-claws ...
+	for i in `find ${S}/ -name 'configure*'`; do
+		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
+	done
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+
+	# procmime API was changed between 0.9.6 and 0.9.7, 
+	# default Makefile uses installed (=old) headers
+	if use pdflib; then
+		cd ${S2}
+		epatch ${FILESDIR}/gv-procmime-Makefile.in.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
+	myconf="${myconf} `use_enable imlib`"
+	myconf="${myconf} `use_enable spell aspell`"
+	myconf="${myconf} `use_enable ldap`"
+	myconf="${myconf} `use_enable ssl openssl`"
+	myconf="${myconf} `use_enable crypt gpgme`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable nls`"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+	myconf="${myconf} `use_enable xface compface`"
+
+	echo ${myconf}
+
+	econf \
+		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
+		${myconf} || die "./configure failed"
+
+	make || die
+
+	# build the extra tools
+	cd ${S}/tools
+	emake || die
+
+	# build the ghostscript-viewer plugin
+	if use pdflib; then
+		cd ${S2}
+		einfo "Compiling ghostscript-viewer plugin"
+		PKG_CONFIG_PATH=${S} \
+		CFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}" \
+		CXXFLAGS="${CFLAGS}" \
+			econf --with-sylpheed-dir=../.. || die
+
+		emake || die
+	fi
+
+	cd ${S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
+	if use gnome; then
+		dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+		dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+		mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
+	else
+		rm -rf ${D}/usr/share/gnome
+	fi
+
+	dodir /usr/share/pixmaps
+	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.png
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	# install the extra tools
+	cd ${S}/tools
+	exeinto /usr/lib/${PN}/tools
+	doexe *.pl *.py *.rc *.conf gpg-sign-syl
+	doexe launch_firebird tb2sylpheed update-po uudec
+
+	# install the ghostscipt-viewer plugin
+	if use pdflib; then
+		cd ${S2}
+		make plugindir=${D}/usr/lib/${PN}/plugins install || die
+		docinto ${MY_GS}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	fi
+}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..909b17fd1da1
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild,v 1.1 2004/05/30 03:05:56 seemant Exp $
+
+IUSE="nls gnome gtk2 xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
+
+inherit eutils
+
+GS_PN=ghostscript-viewer
+GS_PV=0.4
+MY_GS=${GS_PN}-${GS_PV}
+MY_P="sylpheed-${PV}claws"
+PATCHVER=20030917
+S=${WORKDIR}/${MY_P}
+S2=${WORKDIR}/${MY_GS}
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	gtk2? ( http://www.homa.ne.jp/~ashie/linux/files/${MY_P}-gtk2-${PATCHVER}.diff.gz )
+	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND=">=sys-apps/sed-4
+	app-misc/mime-types
+	gtk2? ( =x11-libs/gtk+-2* )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
+	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
+	imlib? ( >=media-libs/imlib-1.9.10 )
+	spell? ( virtual/aspell-dict )
+	xface? ( >=media-libs/compface-1.4 )
+	clamav? ( app-antivirus/clamav )
+	gtkhtml? ( net-www/dillo )
+	pdflib? ( virtual/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+pkg_setup() {
+	if use gtk2; then
+		ewarn "Sylpheed-claws gtk2 support is experimental and breaks some"
+		ewarn "plugins and USE flags. The following things will be disabled"
+		ewarn "if sylpheed-claws is emerged with USE=\"gtk2\":"
+		ewarn "    aspell support, ghostview plugin, trayicon plugin"
+		sleep 2
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Patch for GTK+-2
+	if use gtk2; then
+		epatch ${WORKDIR}/${MY_P}-gtk2-${PATCHVER}.diff
+		sed -i "s/GTK_WINDOW_DIALOG/GTK_WINDOW_POPUP/" "${S}/src/ssl_manager.c"
+	fi
+
+	# Change package name to sylpheed-claws ...
+	for i in `find ${S}/ -name 'configure*'`
+	do
+		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
+	done
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+}
+
+src_compile() {
+	local myconf
+
+	use gnome \
+	    && myconf="${myconf} --enable-gdk-pixbuf" \
+	    || myconf="${myconf} --disable-gdk-pixbuf"
+
+	use imlib \
+	    && myconf="${myconf} --enable-imlib" \
+	    || myconf="${myconf} --disable-imlib"
+
+	[ use spell -a ! use gtk2 ] \
+	    && myconf="${myconf} --enable-aspell" \
+	    || myconf="${myconf} --disable-aspell"
+
+	use ldap && myconf="${myconf} --enable-ldap"
+
+	use ssl && myconf="${myconf} --enable-openssl"
+
+	use crypt && myconf="${myconf} --enable-gpgme"
+
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
+	use pda && myconf="${myconf} --enable-jpilot"
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	use gtk2 && myconf="${myconf} --disable-trayicon-plugin"
+
+	#use gtkhtml \
+	#	&& myconf="${myconf} --enable-dillo-viewer-plugin" \
+	#	|| myconf="${myconf} --disable-dillo-viewer-plugin"
+
+	#use clamav \
+	#	&& myconf="${myconf} --enable-clamav-plugin" \
+	#	|| myconf="${myconf} --disable-clamav-plugin"
+	echo ${myconf}
+
+	use gtk2 && ./autogen.sh
+
+	econf \
+		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
+		${myconf} || die "./configure failed"
+
+	make || die
+
+	# build the extra tools
+	cd ${S}/tools
+	emake || die
+
+	# build the ghostscript-viewer plugin
+	if [ `use pdflib` -a -z `use gtk2` ]; then
+		cd ${S2}
+		econf \
+			--with-sylpheed-dir=${S} || die
+		emake || die
+	fi
+
+	cd ${S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
+	use gnome \
+		&& {
+			dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+			dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+			mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
+		} \
+		|| rm -rf ${D}/usr/share/gnome
+
+	dodir /usr/share/pixmaps
+	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.png
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	# install the extra tools
+	cd ${S}/tools
+	exeinto /usr/lib/${PN}/tools
+	doexe *.pl *.py *.rc *.conf gpg-sign-syl
+	doexe launch_firebird tb2sylpheed update-po uudec
+
+	# install the ghostscipt-viewer plugin
+	if [ `use pdflib` -a -z `use gtk2` ]; then
+		cd ${S2}
+		make plugindir=${D}/usr/lib/${PN}/plugins install || die
+		docinto ${MY_GS}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	fi
+}
+
+pkg_postinst() {
+	einfo "A new plugin scheme has been implemented and many plugins"
+	einfo "now come with sylpheed-claws. The plugins are located in:"
+	einfo "/usr/lib/sylpheed-claws/plugins and are loaded thru the UI."
+}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.7.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
new file mode 100644
index 000000000000..bb44bef3d75a
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.7.ebuild,v 1.1 2004/05/30 03:05:56 seemant Exp $
+
+IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
+
+inherit eutils flag-o-matic
+
+GS_PN=ghostscript-viewer
+GS_PV=0.6
+MY_GS=${GS_PN}-${GS_PV}
+MY_P="sylpheed-${PV}claws"
+S=${WORKDIR}/${MY_P}
+S2=${S}/src/plugins/${MY_GS}
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc ~alpha"
+
+DEPEND=">=sys-apps/sed-4
+	=x11-libs/gtk+-1.2*
+	app-misc/mime-types
+	net-mail/metamail
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
+	dillo? ( net-www/dillo )
+	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
+	imlib? ( >=media-libs/imlib-1.9.10 )
+	spell? ( virtual/aspell-dict )
+	xface? ( >=media-libs/compface-1.4 )
+	clamav? ( app-antivirus/clamav )
+	pdflib? ( virtual/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+src_unpack() {
+	unpack ${A}
+
+	mv ${WORKDIR}/${MY_GS} ${S}/src/plugins
+
+	einfo ${S}
+	einfo ${S2}
+
+	# Change package name to sylpheed-claws ...
+	for i in `find ${S}/ -name 'configure*'`
+	do
+		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
+	done
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+
+	# procmime API was changed between 0.9.6 and 0.9.7, 
+	# default Makefile uses installed (=old) headers
+	if use pdflib; then
+		cd ${S2}
+		epatch ${FILESDIR}/gv-procmime-Makefile.in.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	#use gnome \
+	#    && myconf="${myconf} --enable-gdk-pixbuf" \
+	#    || myconf="${myconf} --disable-gdk-pixbuf"
+	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
+
+	#use imlib \
+	#    && myconf="${myconf} --enable-imlib" \
+	#    || myconf="${myconf} --disable-imlib"
+	myconf="${myconf} `use_enable imlib`"
+
+	#use spell \
+	#    && myconf="${myconf} --enable-aspell" \
+	#    || myconf="${myconf} --disable-aspell"
+	myconf="${myconf} `use_enable spell aspell`"
+
+	#use ldap && myconf="${myconf} --enable-ldap"
+	myconf="${myconf} `use_enable ldap`"
+
+	#use ssl && myconf="${myconf} --enable-openssl"
+	myconf="${myconf} `use_enable ssl openssl`"
+
+	#use crypt && myconf="${myconf} --enable-gpgme"
+	myconf="${myconf} `use_enable crypt gpgme`"
+
+	#use ipv6 && myconf="${myconf} --enable-ipv6"
+	myconf="${myconf} `use_enable ipv6`"
+
+	#use pda && myconf="${myconf} --enable-jpilot"
+	myconf="${myconf} `use_enable pda jpilot`"
+
+	#use nls || myconf="${myconf} --disable-nls"
+	myconf="${myconf} `use_enable nls`"
+
+	#use dillo \
+	#	&& myconf="${myconf} --enable-dillo-viewer-plugin" \
+	#	|| myconf="${myconf} --disable-dillo-viewer-plugin"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+
+	#use clamav \
+	#	&& myconf="${myconf} --enable-clamav-plugin" \
+	#	|| myconf="${myconf} --disable-clamav-plugin"
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+
+	myconf="${myconf} `use_enable xface compface`"
+
+	echo ${myconf}
+
+	econf \
+		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
+		${myconf} || die "./configure failed"
+
+	make || die
+
+	# build the extra tools
+	cd ${S}/tools
+	emake || die
+
+	# build the ghostscript-viewer plugin
+	if use pdflib
+	then
+		cd ${S2}
+		einfo "Compiling ghostscript-viewer plugin"
+		PKG_CONFIG_PATH=${S} \
+		CFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}" \
+		CXXFLAGS="${CFLAGS}" \
+			econf \
+				--with-sylpheed-dir=../.. || die
+
+		emake || die
+	fi
+
+	cd ${S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
+	use gnome \
+		&& {
+			dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+			dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+			mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
+		} \
+		|| rm -rf ${D}/usr/share/gnome
+
+	dodir /usr/share/pixmaps
+	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.png
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	# install the extra tools
+	cd ${S}/tools
+	exeinto /usr/lib/${PN}/tools
+	doexe *.pl *.py *.rc *.conf gpg-sign-syl
+	doexe launch_firebird tb2sylpheed update-po uudec
+
+	# install the ghostscipt-viewer plugin
+	if use pdflib
+	then
+		cd ${S2}
+		make plugindir=${D}/usr/lib/${PN}/plugins install || die
+		docinto ${MY_GS}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	fi
+}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild
new file mode 100644
index 000000000000..896b16c8207d
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild,v 1.1 2004/05/30 03:05:56 seemant Exp $
+
+IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
+
+inherit eutils flag-o-matic
+
+GS_PN=ghostscript-viewer
+GS_PV=0.6
+MY_GS=${GS_PN}-${GS_PV}
+MY_P="sylpheed-${PV}claws"
+S=${WORKDIR}/${MY_P}
+S2=${S}/src/plugins/${MY_GS}
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
+
+DEPEND=">=sys-apps/sed-4
+	=x11-libs/gtk+-1.2*
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
+	dillo? ( net-www/dillo )
+	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
+	imlib? ( >=media-libs/imlib-1.9.10 )
+	spell? ( virtual/aspell-dict )
+	xface? ( >=media-libs/compface-1.4 )
+	pdflib? ( virtual/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	net-mail/metamail
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+src_unpack() {
+	unpack ${A}
+
+	mv ${WORKDIR}/${MY_GS} ${S}/src/plugins
+
+	einfo ${S}
+	einfo ${S2}
+
+	# Change package name to sylpheed-claws ...
+	for i in `find ${S}/ -name 'configure*'`
+	do
+		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
+	done
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+
+	# procmime API was changed between 0.9.6 and 0.9.7, 
+	# default Makefile uses installed (=old) headers
+	if use pdflib; then
+		cd ${S2}
+		epatch ${FILESDIR}/gv-procmime-Makefile.in.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	#use gnome \
+	#    && myconf="${myconf} --enable-gdk-pixbuf" \
+	#    || myconf="${myconf} --disable-gdk-pixbuf"
+	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
+
+	#use imlib \
+	#    && myconf="${myconf} --enable-imlib" \
+	#    || myconf="${myconf} --disable-imlib"
+	myconf="${myconf} `use_enable imlib`"
+
+	#use spell \
+	#    && myconf="${myconf} --enable-aspell" \
+	#    || myconf="${myconf} --disable-aspell"
+	myconf="${myconf} `use_enable spell aspell`"
+
+	#use ldap && myconf="${myconf} --enable-ldap"
+	myconf="${myconf} `use_enable ldap`"
+
+	#use ssl && myconf="${myconf} --enable-openssl"
+	myconf="${myconf} `use_enable ssl openssl`"
+
+	#use crypt && myconf="${myconf} --enable-gpgme"
+	myconf="${myconf} `use_enable crypt gpgme`"
+
+	#use ipv6 && myconf="${myconf} --enable-ipv6"
+	myconf="${myconf} `use_enable ipv6`"
+
+	#use pda && myconf="${myconf} --enable-jpilot"
+	myconf="${myconf} `use_enable pda jpilot`"
+
+	#use nls || myconf="${myconf} --disable-nls"
+	myconf="${myconf} `use_enable nls`"
+
+	#use dillo \
+	#	&& myconf="${myconf} --enable-dillo-viewer-plugin" \
+	#	|| myconf="${myconf} --disable-dillo-viewer-plugin"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+
+	#use clamav \
+	#	&& myconf="${myconf} --enable-clamav-plugin" \
+	#	|| myconf="${myconf} --disable-clamav-plugin"
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+
+	myconf="${myconf} `use_enable xface compface`"
+
+	echo ${myconf}
+
+	econf \
+		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
+		${myconf} || die "./configure failed"
+
+	make || die
+
+	# build the extra tools
+	cd ${S}/tools
+	emake || die
+
+	# build the ghostscript-viewer plugin
+	if use pdflib
+	then
+		cd ${S2}
+		einfo "Compiling ghostscript-viewer plugin"
+		PKG_CONFIG_PATH=${S} \
+		CFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}" \
+		CXXFLAGS="${CFLAGS}" \
+			econf \
+				--with-sylpheed-dir=../.. || die
+
+		emake || die
+	fi
+
+	cd ${S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
+	use gnome \
+		&& {
+			dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+			dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+			mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
+		} \
+		|| rm -rf ${D}/usr/share/gnome
+
+	dodir /usr/share/pixmaps
+	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.png
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	# install the extra tools
+	cd ${S}/tools
+	exeinto /usr/lib/${PN}/tools
+	doexe *.pl *.py *.rc *.conf gpg-sign-syl
+	doexe launch_firebird tb2sylpheed update-po uudec
+
+	# install the ghostscipt-viewer plugin
+	if use pdflib
+	then
+		cd ${S2}
+		make plugindir=${D}/usr/lib/${PN}/plugins install || die
+		docinto ${MY_GS}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	fi
+}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.9.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.9.ebuild
new file mode 100644
index 000000000000..e77a6d63f116
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.9.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.9.ebuild,v 1.1 2004/05/30 03:05:56 seemant Exp $
+
+IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
+
+inherit eutils
+
+GS_PN=ghostscript-viewer
+GS_PV=0.6
+MY_GS=${GS_PN}-${GS_PV}
+MY_P="sylpheed-${PV}claws"
+S=${WORKDIR}/${MY_P}
+S2=${S}/src/plugins/${MY_GS}
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc sparc ~alpha"
+
+DEPEND=">=sys-apps/sed-4
+	=x11-libs/gtk+-1.2*
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
+	dillo? ( net-www/dillo )
+	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
+	imlib? ( >=media-libs/imlib-1.9.10 )
+	spell? ( virtual/aspell-dict )
+	xface? ( >=media-libs/compface-1.4 )
+	pdflib? ( virtual/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	net-mail/metamail
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+src_unpack() {
+	unpack ${A}
+
+	mv ${WORKDIR}/${MY_GS} ${S}/src/plugins
+
+	# Change package name to sylpheed-claws ...
+	for i in `find ${S}/ -name 'configure*'`; do
+		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
+	done
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+
+	# procmime API was changed between 0.9.6 and 0.9.7, 
+	# default Makefile uses installed (=old) headers
+	if use pdflib; then
+		cd ${S2}
+		epatch ${FILESDIR}/gv-procmime-Makefile.in.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
+	myconf="${myconf} `use_enable imlib`"
+	myconf="${myconf} `use_enable spell aspell`"
+	myconf="${myconf} `use_enable ldap`"
+	myconf="${myconf} `use_enable ssl openssl`"
+	myconf="${myconf} `use_enable crypt gpgme`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable nls`"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+	myconf="${myconf} `use_enable xface compface`"
+
+	echo ${myconf}
+
+	econf \
+		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
+		${myconf} || die "./configure failed"
+
+	make || die
+
+	# build the extra tools
+	cd ${S}/tools
+	emake || die
+
+	# build the ghostscript-viewer plugin
+	if use pdflib; then
+		cd ${S2}
+		einfo "Compiling ghostscript-viewer plugin"
+		PKG_CONFIG_PATH=${S} \
+		CFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}" \
+		CXXFLAGS="${CFLAGS}" \
+			econf --with-sylpheed-dir=../.. || die
+
+		emake || die
+	fi
+
+	cd ${S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
+	if use gnome; then
+		dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+		dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+		mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
+	else
+		rm -rf ${D}/usr/share/gnome
+	fi
+
+	dodir /usr/share/pixmaps
+	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.png
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	# install the extra tools
+	cd ${S}/tools
+	exeinto /usr/lib/${PN}/tools
+	doexe *.pl *.py *.rc *.conf gpg-sign-syl
+	doexe launch_firebird tb2sylpheed update-po uudec
+
+	# install the ghostscipt-viewer plugin
+	if use pdflib; then
+		cd ${S2}
+		make plugindir=${D}/usr/lib/${PN}/plugins install || die
+		docinto ${MY_GS}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	fi
+}