added two patches.

6 files changed, 146 insertions, 2 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 17c731ebee4a..9f1905a50f8a 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/sylpheed
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.2 2004/05/30 08:23:39 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.3 2004/05/30 08:38:21 hattya Exp $
+
+*sylpheed-0.9.10-r1 (30 May 2004)
+
+  30 May 2004; Akinori Hattori <hattya@gentoo.org> sylpheed-0.9.10-r1.ebuild,
+  files/sylpheed-namespace.diff, files/sylpheed-procmime.diff:
+  update shared-mime-info patch, and for the IMAP server that have not supported
+  NAMESPACE command (afaik, Binc IMAP). these patches are based on -claws.
 
   30 May 2004; Akinori Hattori <hattya@gentoo.org> sylpheed-0.9.10.ebuild:
   stable on x86.
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 65f9bbe9319e..3c197e533aec 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,5 +1,6 @@
-MD5 8a207e89f5a389e5dc94c5188d2242e0 ChangeLog 9663
+MD5 c3a044f70509a7ff1147cfadcfa386f0 ChangeLog 9977
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 7a0f265b340ff87f8e77250618ac1abd sylpheed-0.9.10-r1.ebuild 1517
 MD5 e5ae7dd8a21d3bd9768db39355cebda3 sylpheed-0.9.10.ebuild 1452
 MD5 0666b92ea29856ab61eebd10219af49d sylpheed-0.9.4-r1.ebuild 2342
 MD5 7cc3069c69e35577d5f41a818a62b1b0 sylpheed-0.9.4.ebuild 1710
@@ -9,6 +10,7 @@ MD5 da2ef01eefa865629abd55a6a2cd00c2 sylpheed-0.9.8-r2.ebuild 2267
 MD5 b8164c1f69f12ae95039c28721e4fe67 sylpheed-0.9.8.ebuild 1577
 MD5 e2854d860f383479cb3a397cb02b1c0c sylpheed-0.9.9-r1.ebuild 2218
 MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10 69
+MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10-r1 69
 MD5 cae6de9566012ff2a026e2fdc0124c53 files/digest-sylpheed-0.9.4 68
 MD5 418deb7215c86a6f07b378e3821bec4b files/digest-sylpheed-0.9.4-r1 149
 MD5 d02828752d567534c4fa0b6c7f757a39 files/digest-sylpheed-0.9.5-r1 149
@@ -18,3 +20,5 @@ MD5 aa4acbd6ca9721ed8ef8e1235ce5ec1a files/digest-sylpheed-0.9.8-r2 150
 MD5 097215ef01246e64be0a004a4eafcd63 files/digest-sylpheed-0.9.9-r1 149
 MD5 073edf4bf5c6725126ecd551cb6a8949 files/gtk2-patch-fix.patch 320
 MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
+MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
+MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
diff --git a/mail-client/sylpheed/files/digest-sylpheed-0.9.10-r1 b/mail-client/sylpheed/files/digest-sylpheed-0.9.10-r1
new file mode 100644
index 000000000000..f6dfbf0a5dfa
--- /dev/null
+++ b/mail-client/sylpheed/files/digest-sylpheed-0.9.10-r1
@@ -0,0 +1 @@
+MD5 4e2242436de3cf3977a1b25b1ddc4930 sylpheed-0.9.10.tar.bz2 2302890
diff --git a/mail-client/sylpheed/files/sylpheed-namespace.diff b/mail-client/sylpheed/files/sylpheed-namespace.diff
new file mode 100644
index 000000000000..2ad209a05fe9
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-namespace.diff
@@ -0,0 +1,15 @@
+diff -urN sylpheed-0.9.11.orig/src/imap.c sylpheed-0.9.11/src/imap.c
+--- sylpheed-0.9.11.orig/src/imap.c	2004-02-16 17:27:14.000000000 +0900
++++ sylpheed-0.9.11/src/imap.c	2004-05-30 13:30:39.716248703 +0900
+@@ -2328,6 +2328,11 @@
+ 	    folder->ns_shared   != NULL)
+ 		return;
+ 
++	if (!imap_has_capability(session, "NAMESPACE")) {
++		imap_get_namespace_by_list(session, folder);
++		return;
++	}
++
+ 	if (imap_cmd_namespace(session, &ns_str) != IMAP_SUCCESS) {
+ 		log_warning(_("can't get namespace\n"));
+ 		imap_get_namespace_by_list(session, folder);
diff --git a/mail-client/sylpheed/files/sylpheed-procmime.diff b/mail-client/sylpheed/files/sylpheed-procmime.diff
new file mode 100644
index 000000000000..9532aca99e33
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-procmime.diff
@@ -0,0 +1,40 @@
+diff -urN sylpheed-0.9.11.orig/src/procmime.c sylpheed-0.9.11/src/procmime.c
+--- sylpheed-0.9.11.orig/src/procmime.c	2004-01-28 15:31:02.000000000 +0900
++++ sylpheed-0.9.11/src/procmime.c	2004-05-30 13:47:15.822408644 +0900
+@@ -946,6 +946,9 @@
+ 		g_free(dir);
+ 		mime_type_list = g_list_concat(mime_type_list, list);
+ 
++		list = procmime_get_mime_type_list("/usr/share/mime/globs");
++		mime_type_list = g_list_concat(mime_type_list, list);
++
+ 		if (!mime_type_list) {
+ 			g_warning("mime.types not found\n");
+ 			return NULL;
+@@ -998,7 +1001,7 @@
+ 		g_strstrip(buf);
+ 
+ 		p = buf;
+-		while (*p && !isspace(*p)) p++;
++		while (*p && !isspace(*p) && (*p != ':')) p++;
+ 		if (*p) {
+ 			*p = '\0';
+ 			p++;
+@@ -1011,7 +1014,7 @@
+ 		mime_type->type = g_strdup(buf);
+ 		mime_type->sub_type = g_strdup(delim + 1);
+ 
+-		while (*p && isspace(*p)) p++;
++		while (*p && (isspace(*p) || (*p == '*') || (*p == '.'))) p++;
+ 		if (*p)
+ 			mime_type->extension = g_strdup(p);
+ 		else
+@@ -1023,7 +1026,7 @@
+ 	fclose(fp);
+ 
+ 	if (!list)
+-		g_warning("Can't read mime.types\n");
++		g_warning("Can't read %s\n", file);
+ 
+ 	return list;
+ }
diff --git a/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild b/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..b0d7eb344e88
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.10-r1.ebuild,v 1.1 2004/05/30 08:38:21 hattya Exp $
+
+inherit eutils
+
+IUSE="ssl xface ipv6 imlib nls gnome ldap crypt pda"
+
+DESCRIPTION="A lightweight email client and newsreader"
+SRC_URI="http://sylpheed.good-day.net/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://sylpheed.good-day.net"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64"
+SLOT="0"
+
+PROVIDE="virtual/sylpheed"
+
+DEPEND="=x11-libs/gtk+-1.2*
+	!amd64? ( nls? ( =sys-devel/gettext-0.12.1* ) )
+	ssl? ( dev-libs/openssl )
+	pda? ( app-pda/jpilot )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	crypt? ( app-crypt/gnupg <app-crypt/gpgme-0.4 )
+	gnome? ( media-libs/gdk-pixbuf )
+	imlib? ( media-libs/imlib )
+	xface? ( >=media-libs/compface-1.4 )"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-namespace.diff
+	epatch ${FILESDIR}/${PN}-procmime.diff
+
+}
+
+src_compile() {
+
+	econf \
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable crypt gpgme` \
+		`use_enable pda jpilot` \
+		`use_enable ldap` \
+		`use_enable ipv6` \
+		`use_enable xface compface` \
+		`use_enable imlib` \
+		`use_enable gnome gdk-pixbuf` \
+		|| die
+
+	emake || die
+
+}
+
+src_install() {
+
+	einstall
+
+	dodir /usr/share/pixmaps
+	insinto /usr/share/pixmaps
+	doins *.png
+
+	if use gnome
+	then
+		dodir /usr/share/gnome/apps/Internet
+		insinto /usr/share/gnome/apps/Internet
+		doins sylpheed.desktop
+	fi
+
+	dodoc [A-Z][A-Z]* ChangeLog*
+
+}