version bump including new plugins, removing the xface use flag

8 files changed, 79 insertions, 486 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index e30d472a9195..681c8c18b094 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/sylpheed-claws
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.13 2004/08/19 02:40:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.14 2004/08/25 07:57:05 genone Exp $
+
+*sylpheed-claws-0.9.12a (25 Aug 2004)
+
+  25 Aug 2004; <genone@gentoo.org> -sylpheed-claws-0.9.12.ebuild,
+  -sylpheed-claws-0.9.12-r1.ebuild, +sylpheed-claws-0.9.12a.ebuild:
+  version bump including several new plugins for maildir, mbox and pgpmime.
 
   18 Aug 2004; Aron Griffis <agriffis@gentoo.org>
   sylpheed-claws-0.9.11.ebuild:
@@ -24,7 +30,7 @@
 
   30 Jul 2004; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.12.ebuild:
   Name has changed upstream, so removing the sed line from src_unpack.
-  Runs good enough for ~ærch, so unmasking now.
+  Runs good enough for ~arch, so unmasking now.
 
   01 Jul 2004; Jason Wever <weeve@gentoo.org> sylpheed-claws-0.9.11.ebuild:
   Stable on sparc.
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index b96aa50af6a1..bd7a205488ac 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -6,22 +6,19 @@ MD5 658a9d46f96119d1d6bed25dfa7147fd sylpheed-claws-0.9.10.ebuild 3755
 MD5 553944c891ab53c40326b7c20adf5ffd sylpheed-claws-0.9.5-r1.ebuild 4624
 MD5 e2fbaf474d88efb6b9f39a805abb80fe sylpheed-claws-0.9.7.ebuild 4664
 MD5 629047acc47cd15a42e01cddaa25e9c1 sylpheed-claws-0.9.11.ebuild 3755
-MD5 5dcb192b520b4c941c4e1c4a5204107b sylpheed-claws-0.9.12.ebuild 3636
-MD5 7ed32750bd055254218966d637878c56 ChangeLog 15509
-MD5 a52732f3243ed1aa683c50912816f889 sylpheed-claws-0.9.12-r1.ebuild 3713
+MD5 22b0515de99049249e4a1ab4b91368cc ChangeLog 15757
+MD5 b069e484f8a50b4b494eb55aca483dc1 sylpheed-claws-0.9.12a.ebuild 4301
 MD5 e5a1953a555e8060722cada98b9d55fb files/digest-sylpheed-claws-0.9.10 149
 MD5 8ca534b232f6988e9df8e9fd48563e43 files/digest-sylpheed-claws-0.9.11 149
 MD5 1e7e11ae4e8aba685f25aa113e70e1b5 files/digest-sylpheed-claws-0.9.5-r1 234
 MD5 a44580928f3fa901eb944e739c070d44 files/digest-sylpheed-claws-0.9.7 148
 MD5 82d3d3968bf15e87b2fc7b5b53c42277 files/gv-procmime-Makefile.in.patch 930
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
-MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
-MD5 a09d3e46460639906752864c7a38b6c4 files/digest-sylpheed-claws-0.9.12 150
-MD5 a09d3e46460639906752864c7a38b6c4 files/digest-sylpheed-claws-0.9.12-r1 150
+MD5 db15d20129837459a3b58fc654301b7c files/digest-sylpheed-claws-0.9.12a 279
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.5 (GNU/Linux)
 
-iD8DBQFBKRQF6J2i8a8J4okRApMHAJ9t87rgh66BNqeTKP4QNMeifuTccQCfZZXZ
-hIfUMBNPHxgpXAHymAMM+Xs=
-=2vyp
+iD8DBQFBLEZd6J2i8a8J4okRAvcNAJ40WZVieU/sZaJTvhGQ1e6xsbCJ0wCfVqNJ
+o7A6sqaQ2IVROTGC9ent8Vg=
+=Pczp
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12
deleted file mode 100644
index 95c98fd78bad..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 798f25bb5dae7fd4959fbcb38868bef0 sylpheed-claws-0.9.12.tar.bz2 3031344
-MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12-r1
deleted file mode 100644
index 95c98fd78bad..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 798f25bb5dae7fd4959fbcb38868bef0 sylpheed-claws-0.9.12.tar.bz2 3031344
-MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
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
new file mode 100644
index 000000000000..d201e94379f7
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a
@@ -0,0 +1,4 @@
+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/sylpheed-0.8.3claws32-dillo.patch b/mail-client/sylpheed-claws/files/sylpheed-0.8.3claws32-dillo.patch
deleted file mode 100644
index 0868c1da8ebc..000000000000
--- a/mail-client/sylpheed-claws/files/sylpheed-0.8.3claws32-dillo.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-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/sylpheed-claws-0.9.12.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12.ebuild
deleted file mode 100644
index 1a76034a73db..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2004 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.12.ebuild,v 1.3 2004/08/11 13:37:23 kugelfang 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"
-S2=${S}/src/plugins/${MY_GS}
-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 )"
-
-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
-
-	# 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 ${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 "NOTE: Some plugins have to be re-loaded."
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild
index ec1992159ca3..6ffaec836185 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12-r1.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild
@@ -1,20 +1,35 @@
 # Copyright 1999-2004 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.12-r1.ebuild,v 1.3 2004/08/22 21:45:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild,v 1.1 2004/08/25 07:57:05 genone Exp $
 
-IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
+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.6
+GS_PV=0.7
+
+PGP_PN=pgpinline
+PGP_PV=0.1
+
+MAILDIR_PN=maildir
+MAILDIR_PV=0.6
+
+MBOX_PN=mailmbox
+MBOX_PV=0.9
+
 MY_GS=${GS_PN}-${GS_PV}
-MY_P="sylpheed-${PV}claws"
-S2=${S}/src/plugins/${MY_GS}
+MY_PGP=${PGP_PN}-${PGP_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 )"
+	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"
@@ -22,7 +37,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 
 COMMONDEPEND="=x11-libs/gtk+-1.2*
 	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
 	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
 	dillo? ( net-www/dillo )
@@ -30,11 +45,11 @@ COMMONDEPEND="=x11-libs/gtk+-1.2*
 	imlib? ( >=media-libs/imlib-1.9.10 )
 	spell? ( virtual/aspell-dict )
 	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )"
-
+	nls? ( >=sys-devel/gettext-0.12 )
+	maildir? ( >=sys-libs/db-4.1 )"
 
 DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
+	>=media-libs/compface-1.4
 	>=sys-apps/sed-4"
 
 RDEPEND="${COMMONDEPEND}
@@ -47,17 +62,34 @@ PROVIDE="virtual/sylpheed"
 src_unpack() {
 	unpack ${A}
 
-	mv ${WORKDIR}/${MY_GS} ${S}/src/plugins
+	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}"
 
-	# 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
+		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
 }
 
@@ -75,12 +107,13 @@ src_compile() {
 	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`"
+	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
@@ -89,17 +122,10 @@ src_compile() {
 	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
+	# build external plugins
+	plugin_compile ${MY_GS} pdflib
+	plugin_compile ${MY_MAILDIR} maildir
+	plugin_compile ${MY_MBOX} mbox
 
 	cd ${S}
 }
@@ -126,16 +152,13 @@ src_install() {
 	# 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
+	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() {