version bump...added plugin support :)

11 files changed, 21 insertions, 794 deletions

diff --git a/net-mail/sylpheed-claws/ChangeLog b/net-mail/sylpheed-claws/ChangeLog
index 17d6d36ac652..00ef933751f2 100644
--- a/net-mail/sylpheed-claws/ChangeLog
+++ b/net-mail/sylpheed-claws/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/sylpheed-claws
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.30 2003/01/10 03:51:09 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.31 2003/01/26 22:01:50 bcowan Exp $
+
+*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 :).
 
 
 *sylpheed-claws-0.8.8-r1 (10 Jan 2003)
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.2 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.2
deleted file mode 100644
index 367e09389b37..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e1fb44f7fac029141a271ab1ca2267f2 sylpheed-0.8.2claws.tar.bz2 1682646
-MD5 0aefb7655f3e882205dc02770b0a7cac sylpheed-gentoo-extra.tar.bz2 3389
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.6 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.6
deleted file mode 100644
index dd20fd766453..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 feeae3ce2a6eb0aba24c32475e762a4b sylpheed-0.8.6claws.tar.bz2 1669183
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.7 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.7
deleted file mode 100644
index 21cfab182ba6..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 afe4a63f9494530b661a3e70e351e6fb sylpheed-0.8.7claws.tar.bz2 1767231
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.8 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.8
deleted file mode 100644
index ce98797eccd6..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e61d2fcb760bd509194437c65214c4b8 sylpheed-0.8.8claws.tar.bz2 1801972
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.9 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.9
new file mode 100644
index 000000000000..6f4111374452
--- /dev/null
+++ b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.9
@@ -0,0 +1 @@
+MD5 c32f8a445b219694e827e7d370d6d487 sylpheed-0.8.9claws.tar.bz2 1900077
diff --git a/net-mail/sylpheed-claws/files/mime.types b/net-mail/sylpheed-claws/files/mime.types
deleted file mode 100644
index 21ff0e816da0..000000000000
--- a/net-mail/sylpheed-claws/files/mime.types
+++ /dev/null
@@ -1,469 +0,0 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s).  Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type
-# registry is at <ftp://ftp.iana.org/in-notes/iana/assignments/media-types/>.
-
-# MIME type			Extension
-application/EDI-Consent
-application/EDI-X12
-application/EDIFACT
-application/activemessage
-application/andrew-inset	ez
-application/applefile
-application/atomicmail
-application/batch-SMTP
-application/beep+xml
-application/cals-1840
-application/commonground
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/eshop
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/font-tdpfr
-application/mac-binhex40	hqx
-application/mac-compactpro	cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathematica-old
-application/msword		doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream	bin dms lha lzh exe class so dll
-application/oda			oda
-application/parityfec
-application/pdf			pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript		ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/qsig
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil		smi smil
-application/timestamp-query
-application/timestamp-reply
-application/vemmi
-application/vnd.3M.Post-it-Notes
-application/vnd.FloGraphIt
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.aether.imp
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.businessobjects
-application/vnd.bmi
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.comsocaller
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.ctc-posml
-application/vnd.cybank
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hhe.lesson-player
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
-application/vnd.hp-PCLXL
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.MiniPay
-application/vnd.ibm.modcap
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.mif		mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel	xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint	ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-xhtml-print+xml
-application/vnd.rapid
-application/vnd.s3sms
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.tve-trigger
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.vividence.scriptfile
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml	wbxml
-application/vnd.wap.wmlc	wmlc
-application/vnd.wap.wmlscriptc	wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yellowriver-custom-menu
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio		bcpio
-application/x-cdlink		vcd
-application/x-chess-pgn		pgn
-application/x-cpio		cpio
-application/x-csh		csh
-application/x-director		dcr dir dxr
-application/x-dvi		dvi
-application/x-futuresplash	spl
-application/x-gtar		gtar
-application/x-hdf		hdf
-application/x-javascript	js
-application/x-koan		skp skd skt skm
-application/x-latex		latex
-application/x-netcdf		nc cdf
-application/x-sh		sh
-application/x-shar		shar
-application/x-shockwave-flash	swf
-application/x-stuffit		sit
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-tcl		tcl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-ustar		ustar
-application/x-wais-source	src
-application/x400-bp
-application/xhtml+xml		xhtml xht
-application/xml
-application/xml-dtd
-application/xml-external-parsed-entity
-application/zip			zip
-audio/32kadpcm
-audio/basic			au snd
-audio/g.722.1
-audio/l16
-audio/midi			mid midi kar
-audio/mp4a-latm
-audio/mpa-robust
-audio/mpeg			mpga mp2 mp3
-audio/parityfec
-audio/prs.sid
-audio/telephone-event
-audio/tone
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff			aif aiff aifc
-audio/x-mpegurl			m3u
-audio/x-pn-realaudio		ram rm
-audio/x-pn-realaudio-plugin	rpm
-audio/x-realaudio		ra
-audio/x-wav			wav
-chemical/x-pdb			pdb
-chemical/x-xyz			xyz
-image/bmp			bmp
-image/cgm
-image/g3fax
-image/gif			gif
-image/ief			ief
-image/jpeg			jpeg jpg jpe
-image/naplps
-image/png			png
-image/prs.btif
-image/prs.pti
-image/tiff			tiff tif
-image/vnd.cns.inf2
-image/vnd.djvu			djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.mix
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp		wbmp
-image/vnd.xiff
-image/x-cmu-raster		ras
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-rgb			rgb
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm
-image/x-xwindowdump		xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-model/iges			igs iges
-model/mesh			msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.vtu
-model/vrml			wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar
-text/css			css
-text/directory
-text/enriched
-text/html			html htm
-text/parityfec
-text/plain			asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext			rtx
-text/rtf			rtf
-text/sgml			sgml sgm
-text/tab-separated-values	tsv
-text/t140
-text/uri-list
-text/vnd.DMClientScript
-text/vnd.IPTC.NITF
-text/vnd.IPTC.NewsML
-text/vnd.abc
-text/vnd.curl
-text/vnd.flatland.3dml
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml		wml
-text/vnd.wap.wmlscript		wmls
-text/x-setext			etx
-text/xml			xml xsl
-text/xml-external-parsed-entity
-video/mp4v-es
-video/mpeg			mpeg mpg mpe
-video/parityfec
-video/pointer
-video/quicktime			qt mov
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl		mxu
-video/vnd.mts
-video/vnd.nokia.interleaved-multimedia
-video/vnd.vivo
-video/x-msvideo			avi
-video/x-sgi-movie		movie
-x-conference/x-cooltalk		ice
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.8.2.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.8.2.ebuild
deleted file mode 100644
index 06e00456b485..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.8.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.8.2.ebuild,v 1.6 2002/12/09 04:33:15 manson Exp $
-
-IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda"
-
-
-MY_P="sylpheed-${PV}claws"
-S=${WORKDIR}/${MY_P}
-S2=${WORKDIR}/gentoo-extra
-DESCRIPTION="Bleeding edge version of Sylpheed"
-SRC_URI="mirror://sourceforge/sylpheed-claws/${MY_P}.tar.bz2
-	mirror://gentoo/sylpheed-gentoo-extra.tar.bz2"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="=x11-libs/gtk+-1.2*
-	pda? ( >=app-misc/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.2.3 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( app-text/aspell )
-	xface? ( >=media-libs/compface-1.4 )
-	gtkhtml? ( net-www/dillo )"
-	
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# This patch allows for dillo web browser to be embeedded
-	if use gtkhtml
-	then
-		cd ${S}
-		patch -p1 < ${S2}/${PN}-0.8.1-gentoo.patch || die
-	fi
-
-	use spell && ( \
-		cd ${S}/src
-
-		case $(pspell-config version) in 0.50*)
-			patch < ${S2}/gtkspell.diff ;;
-		esac
-	)
-}
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --enable-ssl"
-
-	use crypt && myconf="${myconf} --enable-gpgme"
-
-	use gnome && \
-		myconf="${myconf} --enable-gdk-pixbuf" || \
-		myconf="${myconf} --disable-gdk-pixbuf"
-
-	use imlib && \
-		myconf="${myconf} --enable-imlib" || \
-		myconf="${myconf} --disable-imlib"
-	
-	use ldap && myconf="${myconf} --enable-ldap"
-	
-	use spell && myconf="${myconf} --enable-pspell"
-	
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	use pda && myconf="${myconf} --enable-jpilot"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf \
-		--program-suffix=-claws \
-		${myconf} || die "./configure failed"
-
-	for i in `find . -name Makefile` ; do
-		cp $i ${i}.orig
-		sed "s/PACKAGE = sylpheed/PACKAGE = sylpheed-claws/" \
-			< ${i}.orig \
-			> ${i}
-	done
-	cp sylpheed.desktop sylpheed.desktop.orig
-	sed "s/sylpheed.png/sylpheed-claws.png/" \
-		< sylpheed.desktop.orig
-		> sylpheed.desktop
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	
-	use gnome || rm -rf ${D}/usr/share/gnome
-
-	mv ${D}/usr/share/pixmaps/sylpheed.png \
-		${D}/usr/share/pixmaps/sylpheed-claws.png
-}
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.8.6.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.8.6.ebuild
deleted file mode 100644
index 9689083690ed..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.8.6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.8.6.ebuild,v 1.4 2002/12/24 01:07:52 bcowan Exp $
-
-IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda"
-
-MY_P="sylpheed-${PV}claws"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-SRC_URI="mirror://sourceforge/sylpheed-claws/${MY_P}.tar.bz2"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	pda? ( >=app-misc/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.2.3 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( app-text/aspell )
-	xface? ( >=media-libs/compface-1.4 )
-	gtkhtml? ( net-www/dillo )"
-	
-RDEPEND="nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# This patch allows for dillo web browser to be embeedded
-	if use gtkhtml
-	then
-		cd ${S}
-		patch -p1 < ${FILESDIR}/sylpheed-0.8.3claws32-dillo.patch || die
-	fi
-}
-
-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 \
-	    && myconf="${myconf} --enable-aspell" \
-	    || myconf="${myconf} --disable-aspell"
-	    
-	use ldap && myconf="${myconf} --enable-ldap"
-	
-	use ssl && myconf="${myconf} --enable-ssl"
-	
-	use crypt && myconf="${myconf} --enable-gpgme"
-	
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-	
-	use pda && myconf="${myconf} --enable-jpilot"
-	
-	use nls || myconf="${myconf} --disable-nls"
-	
-	echo ${myconf}
-	
-	econf \
-		--program-suffix=-claws \
-		${myconf} || die "./configure failed"
-
-	for i in `find . -name Makefile` ; do
-		cp $i ${i}.orig
-		sed "s/PACKAGE = sylpheed/PACKAGE = sylpheed-claws/" \
-			< ${i}.orig \
-			> ${i}
-	done
-	
-	cp sylpheed.desktop sylpheed.desktop.orig
-	sed "s/sylpheed.png/sylpheed-claws.png/" \
-		< sylpheed.desktop.orig
-		> sylpheed.desktop
-
-	emake || die
-}
-
-src_install() {
-	
-	make DESTDIR=${D} install || die
-	
-	use gnome || rm -rf ${D}/usr/share/gnome
-
-	mv ${D}/usr/share/pixmaps/sylpheed.png \
-		${D}/usr/share/pixmaps/sylpheed-claws.png
-
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*  
-}	
\ No newline at end of file
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.8.7.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.8.7.ebuild
deleted file mode 100644
index d878d4135e62..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.8.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.8.7.ebuild,v 1.3 2003/01/15 21:51:34 bcowan Exp $
-
-IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda"
-
-MY_P="sylpheed-${PV}claws"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-SRC_URI="mirror://sourceforge/sylpheed-claws/${MY_P}.tar.bz2"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	pda? ( >=app-misc/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.2.3 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( app-text/aspell )
-	xface? ( >=media-libs/compface-1.4 )
-	gtkhtml? ( net-www/dillo )"
-	
-RDEPEND="nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# This patch allows for dillo web browser to be embeedded
-	if use gtkhtml
-	then
-		cd ${S}
-		patch -p1 < ${FILESDIR}/sylpheed-0.8.3claws32-dillo.patch || die
-	fi
-}
-
-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 \
-	    && 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"
-	
-	echo ${myconf}
-	
-	econf \
-		--program-suffix=-claws \
-		${myconf} || die "./configure failed"
-
-	for i in `find . -name Makefile` ; do
-		cp $i ${i}.orig
-		sed "s/PACKAGE = sylpheed/PACKAGE = sylpheed-claws/" \
-			< ${i}.orig \
-			> ${i}
-	done
-	
-	cp sylpheed.desktop sylpheed.desktop.orig
-	sed "s/sylpheed.png/sylpheed-claws.png/" \
-		< sylpheed.desktop.orig
-		> sylpheed.desktop
-
-	emake || die
-}
-
-src_install() {
-	
-	make DESTDIR=${D} install || die
-	
-	use gnome || rm -rf ${D}/usr/share/gnome
-
-	mv ${D}/usr/share/pixmaps/sylpheed.png \
-		${D}/usr/share/pixmaps/sylpheed-claws.png
-
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*  
-}	
\ No newline at end of file
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.8.8.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.8.9.ebuild
index 32850db0625f..2d8b49db0a6d 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.8.8.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.8.8.ebuild,v 1.8 2003/01/15 00:07:55 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.8.9.ebuild,v 1.1 2003/01/26 22:01:50 bcowan Exp $
 
 IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda"
 
@@ -8,6 +8,7 @@ inherit eutils
 
 MY_P="sylpheed-${PV}claws"
 S="${WORKDIR}/${MY_P}"
+
 DESCRIPTION="Bleeding edge version of Sylpheed"
 SRC_URI="mirror://sourceforge/sylpheed-claws/${MY_P}.tar.bz2"
 HOMEPAGE="http://sylpheed-claws.sf.net"
@@ -17,16 +18,16 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
-	app-misc/mime-types
 	pda? ( >=app-misc/jpilot-0.99 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )
 	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.3.10 )
+	crypt? ( >=app-crypt/gpgme-0.3.12 )
 	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
 	imlib? ( >=media-libs/imlib-1.9.10 )
 	spell? ( app-text/aspell )
 	xface? ( >=media-libs/compface-1.4 )
-	gtkhtml? ( net-www/dillo )"
+	gtkhtml? ( net-www/dillo )
+	x11-misc/shared-mime-info"
 	
 RDEPEND="nls? ( sys-devel/gettext )"
 
@@ -49,6 +50,10 @@ src_unpack() {
 		sed -e "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" \
 			${i}.orig > ${i}
 	done
+	
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
 }
 
 src_compile() {
@@ -82,6 +87,7 @@ src_compile() {
 	
 	econf \
 		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
 		${myconf} || die "./configure failed"
 
 	emake || die
@@ -101,6 +107,6 @@ src_install() {
 
 	mv ${D}/usr/share/pixmaps/sylpheed.png \
 		${D}/usr/share/pixmaps/sylpheed-claws.png
-	
+
 	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*  
 }