new upstream release (development branch). fixes bug #103807.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 134 insertions, 2 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index d2d6a63df680..570ea9d1147d 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.137 2005/10/06 14:15:33 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.138 2005/10/06 14:25:48 hattya Exp $
+
+*sylpheed-2.1.3 (06 Oct 2005)
+
+  06 Oct 2005; Akinori Hattori <hattya@gentoo.org>
+  +files/sylpheed-2.1-shared-mime-info.diff, +sylpheed-2.1.3.ebuild:
+  new upstream release (development branch). fixes bug #103807.
 
 *sylpheed-2.0.2 (06 Oct 2005)
 
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index df823455d0cf..6574d09cebef 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,12 +1,15 @@
-MD5 b8b5e656bb79adf56dd0e21d5eacda52 ChangeLog 26836
+MD5 44753fe5a0249f756c6e686450665f71 ChangeLog 27052
 MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
 MD5 60c5b928eb843c0dea525da8a5c570d3 sylpheed-1.0.5.ebuild 1571
 MD5 6f30161eee66c04b551369f28ba6a5e5 sylpheed-2.0.0_rc1.ebuild 1501
 MD5 356ec31a489e401d36f83bb4f7daa300 sylpheed-2.0.1.ebuild 1452
 MD5 be92c4fa18449f60b4270b846c3fccfc sylpheed-2.0.2.ebuild 1453
+MD5 9219aa8c950efdcdc892f045ac5e96f1 sylpheed-2.1.3.ebuild 1439
 MD5 9d7ca198678f922f545e9101085454ec files/digest-sylpheed-1.0.5 68
 MD5 0323c076f0b63ccbe5002d3c01f1e18d files/digest-sylpheed-2.0.0_rc1 70
 MD5 acaec4415ed56184b524f510f9774c2d files/digest-sylpheed-2.0.1 68
 MD5 694297deb07a41ac1c3ccccf3d15843f files/digest-sylpheed-2.0.2 68
+MD5 c6104c519010a61bcc3e1686fde39d43 files/digest-sylpheed-2.1.3 68
+MD5 01498a2c484618f1d4c663eac986c55e files/sylpheed-2.1-shared-mime-info.diff 1637
 MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
 MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
diff --git a/mail-client/sylpheed/files/digest-sylpheed-2.1.3 b/mail-client/sylpheed/files/digest-sylpheed-2.1.3
new file mode 100644
index 000000000000..2ced0465a7e0
--- /dev/null
+++ b/mail-client/sylpheed/files/digest-sylpheed-2.1.3
@@ -0,0 +1 @@
+MD5 57f874501c5b0e52b8ec1959fe0359be sylpheed-2.1.3.tar.bz2 2366669
diff --git a/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff b/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff
new file mode 100644
index 000000000000..d16352d58eec
--- /dev/null
+++ b/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff
@@ -0,0 +1,53 @@
+diff -urN sylpheed-2.1.3.orig/libsylph/Makefile.am sylpheed-2.1.3/libsylph/Makefile.am
+--- sylpheed-2.1.3.orig/libsylph/Makefile.am	2005-09-08 16:24:49.000000000 +0900
++++ sylpheed-2.1.3/libsylph/Makefile.am	2005-10-02 20:56:56.940000000 +0900
+@@ -1,7 +1,8 @@
+ 
+ AM_CPPFLAGS = \
+ 	-DG_LOG_DOMAIN=\"LibSylph\" \
+-	-DSYSCONFDIR=\""$(sysconfdir)"\"
++	-DSYSCONFDIR=\""$(sysconfdir)"\" \
++	-DDATADIR=\""$(datadir)"\"
+ 
+ INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)
+ 
+diff -urN sylpheed-2.1.3.orig/libsylph/procmime.c sylpheed-2.1.3/libsylph/procmime.c
+--- sylpheed-2.1.3.orig/libsylph/procmime.c	2005-09-22 20:18:02.000000000 +0900
++++ sylpheed-2.1.3/libsylph/procmime.c	2005-10-02 20:57:55.920000000 +0900
+@@ -1051,6 +1051,9 @@
+ 		g_free(dir);
+ 		mime_type_list = g_list_concat(mime_type_list, list);
+ 
++		list = procmime_get_mime_type_list(DATADIR "/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;
+@@ -1103,7 +1106,7 @@
+ 		g_strstrip(buf);
+ 
+ 		p = buf;
+-		while (*p && !g_ascii_isspace(*p)) p++;
++		while (*p && !g_ascii_isspace(*p) && *p != ':') p++;
+ 		if (*p) {
+ 			*p = '\0';
+ 			p++;
+@@ -1116,7 +1119,7 @@
+ 		mime_type->type = g_strdup(buf);
+ 		mime_type->sub_type = g_strdup(delim + 1);
+ 
+-		while (*p && g_ascii_isspace(*p)) p++;
++		while (*p && (g_ascii_isspace(*p) || *p == '*' || *p == '.')) p++;
+ 		if (*p)
+ 			mime_type->extension = g_strdup(p);
+ 		else
+@@ -1128,7 +1131,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-2.1.3.ebuild b/mail-client/sylpheed/sylpheed-2.1.3.ebuild
new file mode 100644
index 000000000000..573a16c8def8
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-2.1.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.1.3.ebuild,v 1.1 2005/10/06 14:25:48 hattya Exp $
+
+inherit eutils
+
+IUSE="crypt gnome ipv6 ldap nls pda ssl xface"
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.good-day.net/"
+SRC_URI="http://sylpheed.good-day.net/${PN}/v${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+
+PROVIDE="virtual/sylpheed"
+
+DEPEND=">=x11-libs/gtk+-2.4
+	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
+	crypt? ( >=app-crypt/gpgme-0.4.5 )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	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}-${PV%.*}-shared-mime-info.diff
+	automake
+
+}
+
+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` \
+		|| die
+
+	emake || die
+
+}
+
+src_install() {
+
+	einstall
+
+	dodir /usr/share/pixmaps
+	insinto /usr/share/pixmaps
+	doins *.png
+
+	insinto /usr/share/applications
+	doins sylpheed.desktop
+
+	dodoc AUTHORS COPYING ChangeLog* INSTALL* NEWS* README* TODO*
+
+}