bump'n'clean

(Portage version: 1.585-cvs)

13 files changed, 57 insertions, 628 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 65fd7d7b5b50..84b7446d5e82 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/sylpheed-claws
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.41 2005/03/17 21:20:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.42 2005/03/29 07:25:00 genone Exp $
+
+*sylpheed-claws-1.0.4 (29 Mar 2005)
+
+  29 Mar 2005; Marius Mauch <genone@gentoo.org>
+  -files/gv-procmime-Makefile.in.patch, -files/vcalendar-0.4-ical.patch,
+  -sylpheed-claws-0.9.12a-r1.ebuild, -sylpheed-claws-0.9.12a.ebuild,
+  -sylpheed-claws-0.9.12b-r1.ebuild, -sylpheed-claws-0.9.13.ebuild,
+  +sylpheed-claws-1.0.4.ebuild:
+  version bump, going straight to stable for security bug 86541. Cleaning out
+  older versions.
 
   17 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
   sylpheed-claws-1.0.3.ebuild:
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 20cc8433bf6f..05cbf31611f3 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0b5217a4ecef5d29621d23608408f00f sylpheed-claws-0.9.13.ebuild 3514
+MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
+MD5 bbe78917f8927844f57f1320d9ada74a sylpheed-claws-1.0.0.ebuild 3562
+MD5 40c1a0aa9d98d845a54ed255a4b95ccc sylpheed-claws-1.0.3.ebuild 3810
+MD5 40c1a0aa9d98d845a54ed255a4b95ccc sylpheed-claws-1.0.4.ebuild 3810
 MD5 0605664fd7b4d0a100792054a1490956 sylpheed-claws-0.9.12a-r1.ebuild 6469
+MD5 67b1d04ac11ba986e9101f21b73f2158 sylpheed-claws-0.9.12a.ebuild 4243
+MD5 0b5217a4ecef5d29621d23608408f00f sylpheed-claws-0.9.13.ebuild 3514
 MD5 dbb8802b2baa1868dcc42d42f7e49980 sylpheed-claws-0.9.12b-r1.ebuild 3251
-MD5 bbe78917f8927844f57f1320d9ada74a sylpheed-claws-1.0.0.ebuild 3562
-MD5 5e28784efc1dfbfdb851979e59c2de53 ChangeLog 19995
 MD5 def27041a56aa364d9e1a73a0408a5f0 sylpheed-claws-1.0.1.ebuild 3815
-MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
 MD5 2fef7e9e47020b8ef4017433dd505114 sylpheed-claws-1.0.1.1.ebuild 4880
-MD5 67b1d04ac11ba986e9101f21b73f2158 sylpheed-claws-0.9.12a.ebuild 4243
-MD5 40c1a0aa9d98d845a54ed255a4b95ccc sylpheed-claws-1.0.3.ebuild 3810
-MD5 6647f03568da3cd649c64549db6177c6 files/digest-sylpheed-claws-0.9.13 75
-MD5 e4776c1d04bababc02a76a8102e18108 files/vcalendar-0.4-ical.patch 2292
-MD5 db15d20129837459a3b58fc654301b7c files/digest-sylpheed-claws-0.9.12a 279
-MD5 60eaf129bf082ddccef4b8fe4776b353 files/digest-sylpheed-claws-0.9.12b-r1 76
+MD5 5e28784efc1dfbfdb851979e59c2de53 ChangeLog 19995
 MD5 82d3d3968bf15e87b2fc7b5b53c42277 files/gv-procmime-Makefile.in.patch 930
-MD5 2d862dcfbc8d3ac467800ee5bfa816a6 files/digest-sylpheed-claws-1.0.3 74
-MD5 3cda57c34ce8182358f3189330411a8b files/digest-sylpheed-claws-1.0.1 74
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
+MD5 db15d20129837459a3b58fc654301b7c files/digest-sylpheed-claws-0.9.12a 279
+MD5 127bc1fa7e9c9f3d46b0df6f05446360 files/digest-sylpheed-claws-0.9.12a-r1 442
+MD5 e4776c1d04bababc02a76a8102e18108 files/vcalendar-0.4-ical.patch 2292
+MD5 6647f03568da3cd649c64549db6177c6 files/digest-sylpheed-claws-0.9.13 75
 MD5 36875560f20470a8e0265fd9d81e0007 files/digest-sylpheed-claws-1.0.0 74
+MD5 60eaf129bf082ddccef4b8fe4776b353 files/digest-sylpheed-claws-0.9.12b-r1 76
+MD5 3cda57c34ce8182358f3189330411a8b files/digest-sylpheed-claws-1.0.1 74
 MD5 ff80e8ec705644978625111bd6e399ec files/digest-sylpheed-claws-1.0.1.1 85
-MD5 127bc1fa7e9c9f3d46b0df6f05446360 files/digest-sylpheed-claws-0.9.12a-r1 442
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCOgLBugEuf3OQ0akRApixAKCZV8lrtRZ7XoJ1aDGiNY2fXs2umgCghd0A
-l10KZpzqXMLT7JXQMiQQWFY=
-=sK1f
------END PGP SIGNATURE-----
+MD5 2d862dcfbc8d3ac467800ee5bfa816a6 files/digest-sylpheed-claws-1.0.3 74
+MD5 abb48579ea54768c2ee6f172f6d8aa05 files/digest-sylpheed-claws-1.0.4 74
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a
deleted file mode 100644
index d201e94379f7..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 382caecd2b21cbcd9b8d07816025a87c sylpheed-claws-0.9.12a.tar.bz2 3078119
-MD5 838ac4de05926efcdefb32a957669324 ghostscript-viewer-0.7.tar.bz2 286817
-MD5 3659d2249c201b729cf812885ef56e0c maildir-0.6.tar.bz2 216639
-MD5 520c2a2e1e45dda7ebb57e0e1e3ab9b3 mailmbox-0.9.tar.gz 366757
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a-r1
deleted file mode 100644
index 128b8552c36a..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 382caecd2b21cbcd9b8d07816025a87c sylpheed-claws-0.9.12a.tar.bz2 3078119
-MD5 6a3f25a91ce113595f25d43940b972e6 sylpheed-claws-0.9.12a-gtk2.patch.bz2 388439
-MD5 838ac4de05926efcdefb32a957669324 ghostscript-viewer-0.7.tar.bz2 286817
-MD5 3659d2249c201b729cf812885ef56e0c maildir-0.6.tar.bz2 216639
-MD5 520c2a2e1e45dda7ebb57e0e1e3ab9b3 mailmbox-0.9.tar.gz 366757
-MD5 9603019f0e0ddc4c3962bf6cf8844b62 sc-pgpinline-0.1_pre20040825.tar.bz2 219846
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b-r1
deleted file mode 100644
index 341be43b3975..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f986e1226ce02c5791bd677a42765d41 sylpheed-claws-0.9.12b.tar.bz2 3086333
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.13 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.13
deleted file mode 100644
index 1931057652cd..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c528dbcb471a106dcccce145f58c4055 sylpheed-claws-0.9.13.tar.bz2 3048241
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.4 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.4
new file mode 100644
index 000000000000..916c967fcf05
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.4
@@ -0,0 +1 @@
+MD5 ac473de7189a4a9baecf16b72c34dff4 sylpheed-claws-1.0.4.tar.bz2 3188838
diff --git a/mail-client/sylpheed-claws/files/gv-procmime-Makefile.in.patch b/mail-client/sylpheed-claws/files/gv-procmime-Makefile.in.patch
deleted file mode 100644
index fbe11c8c7e1f..000000000000
--- a/mail-client/sylpheed-claws/files/gv-procmime-Makefile.in.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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/vcalendar-0.4-ical.patch b/mail-client/sylpheed-claws/files/vcalendar-0.4-ical.patch
deleted file mode 100644
index ab7f9a7b9247..000000000000
--- a/mail-client/sylpheed-claws/files/vcalendar-0.4-ical.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- vcal_manager.c.org	2004-09-22 15:08:20.000000000 +0200
-+++ vcal_manager.c	2004-10-07 21:40:33.522688052 +0200
-@@ -326,8 +326,8 @@
- 			icalproperty_new_description(event->description),
- 			icalproperty_new_summary(event->summary),
- 			icalproperty_new_sequence(event->sequence + 1),
--			icalproperty_new_class("PUBLIC"),
--			icalproperty_new_transp("OPAQUE"),
-+			icalproperty_new_class(ICAL_CLASS_PUBLIC),
-+			icalproperty_new_transp(ICAL_TRANSP_OPAQUE),
-                 	orgprop,
-                 	0
-                 	);
-@@ -440,11 +440,15 @@
- 	event->uid 		= g_strdup(uid?uid:"");
- 	event->organizer 	= g_strdup(organizer?organizer:"");
- 
--	if (dtend) 
--		event->end	= g_strdup(icaltime_as_ctime(icaltime_as_local(icaltime_from_string(dtend))));
-+	if (dtend) {
-+		time_t tmp = icaltime_as_timet(icaltime_as_local(icaltime_from_string(dtend)));
-+		event->end	= g_strdup(ctime(&tmp));
-+	}
- 	
--	if (dtstart)
--		event->start	= g_strdup(icaltime_as_ctime(icaltime_as_local(icaltime_from_string(dtstart))));
-+	if (dtstart) {
-+		time_t tmp = icaltime_as_timet(icaltime_as_local(icaltime_from_string(dtstart)));
-+		event->start	= g_strdup(ctime(&tmp));
-+	}
- 
- 	event->dtstart		= g_strdup(dtstart?dtstart:"");
- 	event->dtend		= g_strdup(dtend?dtend:"");
---- vcalendar.c.org	2004-09-22 15:08:20.000000000 +0200
-+++ vcalendar.c	2004-10-07 21:38:29.549822328 +0200
-@@ -720,8 +720,8 @@
- 	iprop = vcalviewer_get_property(vcalviewer, ICAL_DTSTART_PROPERTY);
- 	if (iprop) {
- 		struct icaltimetype itt = icaltime_as_local(icalproperty_get_dtstart(iprop));
--		gtk_label_set_text(GTK_LABEL(vcalviewer->start), 
--			icaltime_as_ctime(itt));
-+		time_t tmp = icaltime_as_timet(itt);
-+		gtk_label_set_text(GTK_LABEL(vcalviewer->start), ctime(&tmp));
- 		icalproperty_free(iprop);
- 	} else
- 		gtk_label_set_text(GTK_LABEL(vcalviewer->start), "-");
-@@ -729,8 +729,8 @@
- 	iprop = vcalviewer_get_property(vcalviewer, ICAL_DTEND_PROPERTY);
- 	if (iprop) {
- 		struct icaltimetype itt = icaltime_as_local(icalproperty_get_dtstart(iprop));
--		gtk_label_set_text(GTK_LABEL(vcalviewer->end), 
--			icaltime_as_ctime(itt));
-+		time_t tmp = icaltime_as_timet(itt);
-+		gtk_label_set_text(GTK_LABEL(vcalviewer->end), ctime(&tmp));
- 		icalproperty_free(iprop);
- 	} else
- 		gtk_label_set_text(GTK_LABEL(vcalviewer->end), "-");
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild
deleted file mode 100644
index 5cdd8303b677..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild,v 1.4 2005/01/19 22:30:08 genone Exp $
-
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir mbox gtk2"
-
-inherit eutils
-
-# setting up plugin related variables
-GS_PN=ghostscript-viewer
-GS_PV=0.7
-
-PGP_PN=pgpinline
-PGP_PV=0.1_pre20040825
-
-MAILDIR_PN=maildir
-MAILDIR_PV=0.6
-
-MBOX_PN=mailmbox
-MBOX_PV=0.9
-
-MY_GS=${GS_PN}-${GS_PV}
-MY_PGP=${PGP_PN}-${PGP_PV}
-MY_MAILDIR=${MAILDIR_PN}-${MAILDIR_PV}
-MY_MBOX=${MBOX_PN}-${MBOX_PV}
-
-GTK2_PATCH="${P}-gtk2.patch.bz2"
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	gtk2? ( mirror://gentoo/${GTK2_PATCH} http://dev.gentoo.org/~genone/distfiles/${GTK2_PATCH} )
-	!gtk2? ( pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )
-			 maildir? ( mirror://sourceforge/${PN}/${MY_MAILDIR}.tar.bz2 )
-			 mbox? ( http://${PN}.sourceforge.net/downloads/${MY_MBOX}.tar.gz )
-			 crypt? ( mirror://gentoo/sc-${MY_PGP}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/sc-${MY_PGP}.tar.bz2 )
-			)"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-
-COMMONDEPEND="
-	!gtk2? ( =x11-libs/gtk+-1.2*
-			 maildir? ( >=sys-libs/db-4.1 )
-			 pdflib? ( virtual/ghostscript )
-			)
-	gtk2? ( >=x11-libs/gtk+-2.4 )
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
-	dillo? ( www-client/dillo )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( virtual/aspell-dict )
-	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )"
-
-DEPEND="${COMMONDEPEND}
-	>=media-libs/compface-1.4
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	net-mail/metamail
-	x11-misc/shared-mime-info"
-
-PROVIDE="virtual/sylpheed"
-
-pkg_setup() {
-	if use gtk2; then
-		einfo "Using the GTK2 branch"
-		echo
-		ewarn "This branch is still a testing version. Some USE flags might not"
-		ewarn "work when used together with gtk2 and could generate compile errors."
-		ewarn "It will most likely have bugs, so please note that it is"
-		ewarn "      COMPLETELY UNSUPPORTED BY GENTOO"
-		echo
-		ewarn "All external plugins are currently incompatible with the gtk2 version"
-		ewarn "and will be disabled for this build. This affects the ghostscript, "
-		ewarn "maildir, mbox and pgpinline plugins. If you need them you'll have"
-		ewarn "to disable gtk2."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	for plugin in ${MY_GS} ${MY_MAILDIR} ${MY_MBOX} ${MY_PGP}; do
-		[ -d ${WORKDIR}/${plugin} ] && mv ${WORKDIR}/${plugin} ${S}/src/plugins
-	done
-
-	# lets see how well this works
-	if use gtk2; then
-		cd ${S}
-		epatch ${WORKDIR}/${GTK2_PATCH%.bz2}
-	fi
-
-	# use shared-mime-info
-	cd ${S}/src
-	epatch ${FILESDIR}/procmime.patch
-}
-
-plugin_compile() {
-	if use gtk2; then
-		ewarn "Plugin ${1} disabled due to gtk2 incompability"
-		return
-	elif [ -z "${2}" ] || use ${2}; then
-		cd ${S}/src/plugins/${1}
-		einfo "Compiling plugin: ${1}"
-		local myPKG_CONFIG_PATH=${S}
-		local myCFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}"
-
-		CFLAGS="${myCFLAGS}" \
-		CXXFLAGS="${myCXXFLAGS}" \
-			econf --with-sylpheed-dir=../.. || die "plugin configure failed: ${1}"
-
-		einfo emake CFLAGS="${myCFLAGS}" CXXFLAGS="${myCFLAGS}" SYLPHEED_CLAWS_CFLAGS="${myCFLAGS}" || die "plugin compile failed: ${1}"
-		emake CFLAGS="${myCFLAGS}" CXXFLAGS="${myCFLAGS}" SYLPHEED_CLAWS_CFLAGS="${myCFLAGS}" || die "plugin compile failed: ${1}"
-	fi
-}
-
-plugin_install() {
-	if use gtk2; then
-		return
-	elif [ -z "${2}" ] || use ${2}; then
-		cd ${S}/src/plugins/${1}
-		make DESTDIR="${D}" plugindir="/usr/lib/${PN}/plugins" install || die "plugin install failed: ${1}"
-		docinto ${1}
-		dodoc AUTHORS ChangeLog INSTALL NEWS README
-	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 crypt pgpmime-plugin`"
-	use gtk2 && myconf="${myconf} --with-config-dir=.sylpheed-claws"
-
-	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
-	econf \
-		--program-suffix=-claws \
-		--enable-spamassassin-plugin \
-		--enable-compface \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-
-	# build external plugins
-	plugin_compile ${MY_GS} pdflib
-	plugin_compile ${MY_MAILDIR} maildir
-	plugin_compile ${MY_MBOX} mbox
-	plugin_compile ${MY_PGP} crypt
-
-	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 ${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 *.sh gpg-sign-syl
-	doexe tb2sylpheed update-po uudec
-
-	# install external plugins
-	plugin_install ${MY_GS} pdflib
-	plugin_install ${MY_MAILDIR} maildir
-	plugin_install ${MY_MBOX} mbox
-	plugin_install ${MY_PGP} crypt
-}
-
-pkg_postinst() {
-	if use gtk2; then
-		ewarn "The GTK2 branch is still a testing version. Some USE flags might not"
-		ewarn "work when used together with gtk2 and could generate compile errors."
-		ewarn "It will most likely have bugs, so please note that it is"
-		ewarn "      COMPLETELY UNSUPPORTED BY GENTOO"
-		echo
-		einfo "For safety reasons this version will use the alternate configuration"
-		einfo "directory ~/.sylpheed-claws instead of ~/.sylpheed, so you have to"
-		einfo "copy your configuration manually or create a new one."
-	else
-		einfo "NOTE: some plugins may have to be reloaded."
-	fi
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild
deleted file mode 100644
index c8ecc41c7a06..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild,v 1.8 2005/01/19 22:30:08 genone Exp $
-
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir mbox"
-
-inherit eutils
-
-# setting up plugin related variables
-GS_PN=ghostscript-viewer
-GS_PV=0.7
-
-MAILDIR_PN=maildir
-MAILDIR_PV=0.6
-
-MBOX_PN=mailmbox
-MBOX_PV=0.9
-
-MY_GS=${GS_PN}-${GS_PV}
-MY_MAILDIR=${MAILDIR_PN}-${MAILDIR_PV}
-MY_MBOX=${MBOX_PN}-${MBOX_PV}
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )
-	maildir? ( mirror://sourceforge/${PN}/${MY_MAILDIR}.tar.bz2 )
-	mbox? ( http://${PN}.sourceforge.net/downloads/${MY_MBOX}.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64"
-
-COMMONDEPEND="=x11-libs/gtk+-1.2*
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
-	dillo? ( www-client/dillo )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( virtual/aspell-dict )
-	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )
-	maildir? ( >=sys-libs/db-4.1 )"
-
-DEPEND="${COMMONDEPEND}
-	>=media-libs/compface-1.4
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	net-mail/metamail
-	x11-misc/shared-mime-info"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-	unpack ${A}
-
-	for plugin in ${MY_GS} ${MY_MAILDIR} ${MY_MBOX}; do
-		mv ${WORKDIR}/${plugin} ${S}/src/plugins
-	done
-
-	# use shared-mime-info
-	cd ${S}/src
-	epatch ${FILESDIR}/procmime.patch
-}
-
-plugin_compile() {
-	if [ -z "${2}" ] || use ${2}; then
-		cd ${S}/src/plugins/${1}
-		einfo "Compiling plugin: ${1}"
-		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 "plugin configure failed: ${1}"
-
-		emake || die "plugin compile failed: ${1}"
-	fi
-}
-
-plugin_install() {
-	if [ -z "${2}" ] || use ${2}; then
-		cd ${S}/src/plugins/${1}
-		make DESTDIR="${D}" plugindir="/usr/lib/${PN}/plugins" install || die "plugin install failed: ${1}"
-		docinto ${1}
-		dodoc AUTHORS ChangeLog INSTALL NEWS README
-	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 crypt pgpmime-plugin`"
-
-	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
-	econf \
-		--program-suffix=-claws \
-		--enable-spamassassin-plugin \
-		--enable-compface \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-
-	# build external plugins
-	plugin_compile ${MY_GS} pdflib
-	plugin_compile ${MY_MAILDIR} maildir
-	plugin_compile ${MY_MBOX} mbox
-
-	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 ${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 *.sh gpg-sign-syl
-	doexe tb2sylpheed update-po uudec
-
-	# install external plugins
-	plugin_install ${MY_GS} pdflib
-	plugin_install ${MY_MAILDIR} maildir
-	plugin_install ${MY_MBOX} mbox
-}
-
-pkg_postinst() {
-	einfo "NOTE: Some plugins have to be re-loaded."
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b-r1.ebuild
deleted file mode 100644
index f6c964ddd811..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b-r1.ebuild,v 1.7 2005/01/24 12:46:48 genone Exp $
-
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir mbox xface"
-
-inherit eutils
-
-# setting up plugin related variables
-GS_VERSION="ghostscript-viewer-0.8"
-PGP_VERSION="pgpinline-0.2"
-MAILDIR_VERSION="maildir-0.6"
-MBOX_VERSION="mailmbox-0.9"
-VCAL_VERSION="vcalendar-0.4"
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
-
-COMMONDEPEND="=x11-libs/gtk+-1.2*
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
-	dillo? ( www-client/dillo )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( virtual/aspell-dict )
-	nls? ( >=sys-devel/gettext-0.12 )"
-
-DEPEND="${COMMONDEPEND}
-	>=media-libs/compface-1.4
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	net-mail/metamail
-	x11-misc/shared-mime-info"
-
-PDEPEND="gs? ( =mail-client/${PN}-${GS_VERSION} )
-		 maildir? ( =mail-client/${PN}-${MAILDIR_VERSION} )
-		 mbox? ( =mail-client/${PN}-${MBOX_VERSION} )
-		 crypt? ( =mail-client/${PN}-${PGP_VERSION} )"
-#		 calendar? ( =mail-client/${PN}-${VCAL_VERSION} )"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-	unpack ${A}
-
-	# use shared-mime-info
-	cd ${S}/src
-	epatch ${FILESDIR}/procmime.patch
-}
-
-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 crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable xface compface`"
-
-	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
-	econf \
-		--program-suffix=-claws \
-		--enable-spamassassin-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-}
-
-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 ${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 *.sh gpg-sign-syl
-	doexe tb2sylpheed update-po uudec
-}
-
-pkg_postinst() {
-	einfo "NOTE: Some plugins have to be re-loaded."
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.13.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4.ebuild
index 1dfddcab8f68..0b30ea678fc7 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.13.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.13.ebuild,v 1.2 2005/01/19 22:30:08 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.4.ebuild,v 1.1 2005/03/29 07:25:00 genone Exp $
 
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir mbox calendar xface"
+IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface kde" # mbox
 
 inherit eutils
 
@@ -10,15 +10,15 @@ inherit eutils
 GS_VERSION="ghostscript-viewer-0.8"
 PGP_VERSION="pgpinline-0.5"
 MAILDIR_VERSION="maildir-0.7"
-MBOX_VERSION="mailmbox-0.9"
-VCAL_VERSION="vcalendar-0.4"
 
 DESCRIPTION="Bleeding edge version of Sylpheed"
 HOMEPAGE="http://sylpheed-claws.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2"
+
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
+KEYWORDS="x86 ~ppc ~sparc amd64 ~alpha"
 
 COMMONDEPEND="=x11-libs/gtk+-1.2*
 	pda? ( >=app-pda/jpilot-0.99 )
@@ -30,6 +30,7 @@ COMMONDEPEND="=x11-libs/gtk+-1.2*
 	imlib? ( >=media-libs/imlib-1.9.10 )
 	spell? ( virtual/aspell-dict )
 	nls? ( >=sys-devel/gettext-0.12 )
+	kde? ( kde-base/kdelibs )
 	x11-libs/startup-notification"
 
 DEPEND="${COMMONDEPEND}
@@ -44,8 +45,7 @@ RDEPEND="${COMMONDEPEND}
 PDEPEND="pdflib? ( =mail-client/${PN}-${GS_VERSION} )
 		 maildir? ( =mail-client/${PN}-${MAILDIR_VERSION} )
 		 crypt? ( =mail-client/${PN}-${PGP_VERSION} )"
-#		 mbox? ( =mail-client/${PN}-${MBOX_VERSION} )
-#		 calendar? ( =mail-client/${PN}-${VCAL_VERSION} )
+#		 mbox? ( =mail-client/${PN}-${MBOX_VERSION} )"
 
 PROVIDE="virtual/sylpheed"
 
@@ -90,17 +90,16 @@ src_compile() {
 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
+	local menuentry="/usr/share/applications/sylpheed-claws.desktop"
+	insinto /usr/share/applications
+	newins ${S}/sylpheed.desktop sylpheed-claws.desktop
+	dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+	dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+	rm -rf ${D}/usr/share/gnome
 
-	dodir /usr/share/pixmaps
-	mv ${D}/usr/share/pixmaps/sylpheed{,-claws}.png
+	insinto /usr/share/pixmaps
+	newins ${S}/sylpheed.png sylpheed-claws.png
+	rm -f ${D}/usr/share/pixmaps/sylpheed.png
 
 	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
 	docinto tools
@@ -109,15 +108,25 @@ src_install() {
 	# install the extra tools
 	cd ${S}/tools
 	exeinto /usr/lib/${PN}/tools
-	doexe *.pl *.py *.rc *.conf *.sh gpg-sign-syl
-	doexe tb2sylpheed update-po uudec
+	doexe *.pl *.py *.rc *.conf *.sh
+	doexe tb2sylpheed update-po uudec gpg-sign-syl
+
+	if use kde; then
+		local kdeprefix="$(kde-config --prefix)"
+		local servicescript="sylpheed-kdeservicemenu.pl"
+		cd ${S}/tools/kdeservicemenu
+		for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do
+			sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f
+			install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f
+		done
+		insinto ${kdeprefix}/bin
+		doexe ${servicescript}
+	fi
 }
 
 pkg_postinst() {
 	ewarn
 	ewarn "You have to re-emerge or update all external plugins"
-	use mbox && ewarn "There is no updated version of the mailmbox plugin available yet."
-	use calendar && ewarn "There is no updated version of the calendar plugin available yet."
 	ewarn
 	epause 5
 	ebeep 3