added metamail dependency, removing old versions, changing some DEPENDs to RDEPEND

14 files changed, 26 insertions, 757 deletions

diff --git a/net-mail/sylpheed-claws/ChangeLog b/net-mail/sylpheed-claws/ChangeLog
index 0262169a6045..a20a79f07228 100644
--- a/net-mail/sylpheed-claws/ChangeLog
+++ b/net-mail/sylpheed-claws/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/sylpheed-claws
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.62 2004/01/16 21:20:49 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.63 2004/01/16 22:18:34 genone Exp $
+
+  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:
diff --git a/net-mail/sylpheed-claws/Manifest b/net-mail/sylpheed-claws/Manifest
index a103a8c538f4..e0d9c22fdda7 100644
--- a/net-mail/sylpheed-claws/Manifest
+++ b/net-mail/sylpheed-claws/Manifest
@@ -1,21 +1,11 @@
-MD5 86deebdc7cb71bb9cbd56bbbce382224 ChangeLog 11992
-MD5 799733f5421ef60964d6df8062dfc7b3 metadata.xml 345
-MD5 bc48d6008c4080b5d2939893aca0f536 sylpheed-claws-0.8.11.ebuild 2930
-MD5 368dd7a86bea6f5a73bbabfcfbb1513e sylpheed-claws-0.9.0-r1.ebuild 3321
+MD5 04b83e10408044754d815f09c3c5bc81 sylpheed-claws-0.9.7.ebuild 4663
 MD5 2f2ec47ada1d8ac8af874b711363a5da sylpheed-claws-0.9.5-r1.ebuild 4641
-MD5 a8f46253f531dac5e48961dc4aefc02e sylpheed-claws-0.9.5.ebuild 3865
-MD5 34fd856e84cd2e2025d503c5cf7d68d0 sylpheed-claws-0.9.6-r1.ebuild 4120
-MD5 b3c5a453825f4b094707db17c320ec6f sylpheed-claws-0.9.6.ebuild 3865
-MD5 2aefb8777e344f4729b3b37ab8e3618f sylpheed-claws-0.9.7.ebuild 4644
-MD5 4ad2e9e2c742e29b535c148424cd015d sylpheed-claws-0.9.8.ebuild 4618
-MD5 8b029fc7176a8bad264d1676bd83984b files/digest-sylpheed-claws-0.8.11 74
-MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0-r1 73
-MD5 1d59fb5412cf0ddfa5c4e5e85ab6c37c files/digest-sylpheed-claws-0.9.5 148
-MD5 1e7e11ae4e8aba685f25aa113e70e1b5 files/digest-sylpheed-claws-0.9.5-r1 234
-MD5 706bd2a62e08094bb59b3c1710aa353b files/digest-sylpheed-claws-0.9.6 148
-MD5 c3ecddf9975c9491b9068172ed57bd4e files/digest-sylpheed-claws-0.9.6-r1 148
+MD5 63be7b86aab6cee3f81e42891c0818b6 sylpheed-claws-0.9.8.ebuild 4658
+MD5 2d8e730e94f62c3a786ed66157f085fd ChangeLog 12560
+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 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
-MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
-MD5 7e4997657b4184182e39ad72ff9d1a01 files/digest-sylpheed-claws-0.9.8 148
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.11 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.11
deleted file mode 100644
index 49152e7c7b20..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.8.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66cab47179fbfec4b8b7968be07bacab sylpheed-0.8.11claws.tar.bz2 1863930
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.0-r1 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.0-r1
deleted file mode 100644
index 07a5c0be1f55..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e547783629300e5a1a06fb5f20b9f7fd sylpheed-0.9.0claws.tar.bz2 1921817
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.5 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.5
deleted file mode 100644
index ac5243b0dceb..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 66d72383222e4deb47300889d24f1044 sylpheed-0.9.5claws.tar.bz2 2733738
-MD5 3cb2d0e1cf2cd49ac51e6223e5cf4f33 ghostscript-viewer-0.4.tar.bz2 184684
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.6 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.6
deleted file mode 100644
index fa5ddb1cce18..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a4a7e7c9a6c1b17f688a782e8c06ae4b sylpheed-0.9.6claws.tar.bz2 2827398
-MD5 3cb2d0e1cf2cd49ac51e6223e5cf4f33 ghostscript-viewer-0.4.tar.bz2 184684
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.6-r1 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.6-r1
deleted file mode 100644
index 0367976629a5..000000000000
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.6-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a4a7e7c9a6c1b17f688a782e8c06ae4b sylpheed-0.9.6claws.tar.bz2 2827398
-MD5 bf738bb8938638bb5c0ba443d83ca909 ghostscript-viewer-0.5.tar.bz2 241944
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.ebuild
deleted file mode 100644
index 815e71b00dcd..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.8.11.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2003 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.11.ebuild,v 1.8 2003/12/16 22:55:17 genone Exp $
-
-IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda"
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
-
-DEPEND="=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 )
-	gtkhtml? ( net-www/dillo )
-	x11-misc/shared-mime-info"
-
-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}
-		epatch ${FILESDIR}/sylpheed-0.8.3claws32-dillo.patch
-	fi
-
-	# Change package name to sylpheed-claws ...
-	for i in `find ${S}/ -name 'configure*'`
-	do
-		cp $i ${i}.orig
-		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() {
-	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 \
-		--enable-spamassassin-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-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
-
-	mv ${D}/usr/share/pixmaps/sylpheed.png \
-		${D}/usr/share/pixmaps/sylpheed-claws.png
-
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
-}
-
-pkg_postinst() {
-	einfo "A new plugin scheme has been implemented and a spamassassin plugin"
-	einfo "now comes with sylpheed-claws. For info on these please read the"
-	einfo "Changelog"
-}
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild
deleted file mode 100644
index 19099b163e24..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2003 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.9.0-r1.ebuild,v 1.9 2003/12/16 22:55:17 genone Exp $
-
-IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav"
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha"
-
-DEPEND="=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? ( net-mail/clamav )
-	x11-misc/shared-mime-info"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-	unpack ${A}
-
-	# Change package name to sylpheed-claws ...
-	for i in `find ${S}/ -name 'configure*'`
-	do
-		cp $i ${i}.orig
-		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() {
-	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"
-
-	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}
-
-	econf \
-		--program-suffix=-claws \
-		--enable-trayicon-plugin \
-		--enable-spamassassin-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-	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
-
-	mv ${D}/usr/share/pixmaps/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_phoenix tb2sylpheed update-po uudec
-}
-
-pkg_postinst() {
-	einfo "A new plugin scheme has been implemented and a spamassassin plugin"
-	einfo "now comes with sylpheed-claws. For info on these please read the"
-	einfo "Changelog"
-}
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.5.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.5.ebuild
deleted file mode 100644
index 7022adefff21..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.5.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2003 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.9.5.ebuild,v 1.4 2003/12/16 22:55:17 genone Exp $
-
-IUSE="nls gnome 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"
-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
-	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
-	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? ( net-mail/clamav )
-	gtkhtml? ( net-www/dillo )
-	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )
-	x11-misc/shared-mime-info"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-	unpack ${A}
-
-	# 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 \
-	    && 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 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}
-
-	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}
-		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
-	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/net-mail/sylpheed-claws/sylpheed-claws-0.9.6-r1.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.6-r1.ebuild
deleted file mode 100644
index a27a2c4716c5..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2003 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.9.6-r1.ebuild,v 1.5 2003/12/16 22:55:17 genone 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.5
-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
-	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? ( net-mail/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
-}
-
-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"
-
-	use dillo \
-		&& 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}
-
-	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
-}
-
-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/net-mail/sylpheed-claws/sylpheed-claws-0.9.6.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.6.ebuild
deleted file mode 100644
index ad3c3bf5eaea..000000000000
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.6.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2003 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.9.6.ebuild,v 1.4 2003/12/16 22:55:17 genone Exp $
-
-IUSE="nls gnome 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"
-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
-	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
-	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? ( net-mail/clamav )
-	gtkhtml? ( net-www/dillo )
-	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )
-	x11-misc/shared-mime-info"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-	unpack ${A}
-
-	# 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 \
-	    && 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 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}
-
-	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}
-		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
-	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/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
index 1b76f7054e10..3436bb08966a 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.9.7.ebuild,v 1.6 2004/01/16 21:20:49 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild,v 1.7 2004/01/16 22:18:34 genone Exp $
 
 IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
@@ -24,6 +24,7 @@ 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 )
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.8.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.8.ebuild
index b5bfc9a8a67c..dc3c69aa6893 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.8.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.9.8.ebuild,v 1.1 2003/12/20 14:40:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.8.ebuild,v 1.2 2004/01/16 22:18:34 genone Exp $
 
 IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
@@ -23,7 +23,6 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND=">=sys-apps/sed-4
 	=x11-libs/gtk+-1.2*
-	app-misc/mime-types
 	pda? ( >=app-pda/jpilot-0.99 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )
 	ldap? ( >=net-nds/openldap-2.0.7 )
@@ -34,7 +33,11 @@ DEPEND=">=sys-apps/sed-4
 	spell? ( virtual/aspell-dict )
 	xface? ( >=media-libs/compface-1.4 )
 	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )
+	nls? ( >=sys-devel/gettext-0.12 )"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	net-mail/metamail
 	x11-misc/shared-mime-info"
 
 PROVIDE="virtual/sylpheed"