fix newline display errors with patch from upstream, reported in bug 328369 by Anna Z <chaotic.anna AT gmail DOT com>

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 73 insertions, 6 deletions

diff --git a/mail-client/claws-mail-rssyl/ChangeLog b/mail-client/claws-mail-rssyl/ChangeLog
index e3aec282e8a8..6d86321bc084 100644
--- a/mail-client/claws-mail-rssyl/ChangeLog
+++ b/mail-client/claws-mail-rssyl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/claws-mail-rssyl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/ChangeLog,v 1.71 2010/06/20 13:36:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/ChangeLog,v 1.72 2010/07/18 06:44:24 fauli Exp $
+
+*claws-mail-rssyl-0.27-r1 (18 Jul 2010)
+
+  18 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  +claws-mail-rssyl-0.27-r1.ebuild,
+  +files/claws-mail-rssyl-0.27-newline_hiccup.patch:
+  fix newline display errors with patch from upstream, reported in bug
+  328369 by Anna Z <chaotic.anna AT gmail DOT com>
 
   20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   -claws-mail-rssyl-0.25.ebuild:
diff --git a/mail-client/claws-mail-rssyl/Manifest b/mail-client/claws-mail-rssyl/Manifest
index 33242257fb9b..2dbb4565ad91 100644
--- a/mail-client/claws-mail-rssyl/Manifest
+++ b/mail-client/claws-mail-rssyl/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX claws-mail-rssyl-0.27-newline_hiccup.patch 535 RMD160 955e362c07fdf99f188d2f30ddf529ab03f3966b SHA1 ce34017880911b1eb98ff88ece5a35496af6c869 SHA256 9343204ea246f222c06d046278b4a0430865e04d6c22965113b8aa435ef56016
 DIST rssyl-0.26.tar.gz 469206 RMD160 001e99ff07bf15829c00b620791d0faed53703e4 SHA1 18b65097aa5edcc3e5b2e660f6c9f02172705409 SHA256 d1ac23978f21580d232283f64d78cb3f3e4c5cccc9ca4ec08e266b53696ee1ec
 DIST rssyl-0.27.tar.gz 474657 RMD160 9466e2fab32449a36ef8b7223db567e09f96c539 SHA1 16b6d9e7fec438e848832b84a4991b534c968908 SHA256 d8830a572f9e28e8bb95eb78673e80e0a074652cbaecef509964fa6db54dea57
 EBUILD claws-mail-rssyl-0.26.ebuild 972 RMD160 e224b9f4cd214ba85510b2a28620520c0b57e546 SHA1 1214ec78e26e8a6bba5daba57d316aafb1ef8e67 SHA256 888835b5230b122b285f9ce4b6b68a16f4bfa3e249a439b5729c284c60a280b9
+EBUILD claws-mail-rssyl-0.27-r1.ebuild 1044 RMD160 576fe9df7dacb3607e6e29d2817ac8c38fbd9cc6 SHA1 eb7972d6b152264c44c89e8f712f4bbcd51c9cd5 SHA256 47e308d32fbd9c0560eb91c66d724d855fde19cf1fad8e42360bc3a275da060b
 EBUILD claws-mail-rssyl-0.27.ebuild 976 RMD160 4629db108c60d41b1a2486afff8b867269fae2e1 SHA1 a4a6763ece0ceb158399119f75c8905ffbaee5a7 SHA256 548142f2e49faf1c1ec4c7481a02986795f595459fd03d8c754c6194aad7fa64
-MISC ChangeLog 9226 RMD160 2457c33e78f6e406160962d825acbb87ee8cbce7 SHA1 66857332327f7eceebcd5935e7c4c76f65bc598f SHA256 2abedfe9395e427f553a12c14c8d86cf45a17ec1e05891c7d6ef98b7aaa4a326
+MISC ChangeLog 9534 RMD160 a09b1438440e25b9cc5cbd755bb6b9d867cf6ac7 SHA1 9364e1d04cee53a3cb07d2781e465da0ce166d1f SHA256 b2d79a882b2e0f50f4c770f9a1a243f169cd8c0a695d45243c9d6ad254e25257
 MISC metadata.xml 360 RMD160 7920ed280d15221eb0ffeb146c46481217c52087 SHA1 8976b5970f041847569731ebdc091ce0dc512b3a SHA256 fa45d98c4738cc095b45028ffabf31fc70c553c9075b6c53ca931237666ef19e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkweGYwACgkQNQqtfCuFnePRXwCfV+R5rA1DU783jBimCY8XcdLO
-YnQAnjABBJ3IMlru+CIXyEPOh9IQgPk3
-=nwBM
+iEYEARECAAYFAkxCo0UACgkQNQqtfCuFneMraQCdEDIcFINb+mmaRdUCDTqGGqfO
+QTsAoI8PBpkX0vd82s85ZfgJuviat3pM
+=VRQs
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.27-r1.ebuild b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.27-r1.ebuild
new file mode 100644
index 000000000000..8bf5c6bff7ee
--- /dev/null
+++ b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.27-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.27-r1.ebuild,v 1.1 2010/07/18 06:44:24 fauli Exp $
+
+EAPI="3"
+
+inherit eutils
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Read your favorite newsfeeds in Claws Mail. RSS 1.0, 2.0 and Atom feeds are currently supported"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+RDEPEND=">=mail-client/claws-mail-3.7.6
+	net-misc/curl
+	dev-libs/libxml2
+	nls? ( >=sys-devel/gettext-0.12.1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-newline_hiccup.patch
+}
+
+src_configure() {
+	econf $(use_enable nls) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README || die
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-rssyl/files/claws-mail-rssyl-0.27-newline_hiccup.patch b/mail-client/claws-mail-rssyl/files/claws-mail-rssyl-0.27-newline_hiccup.patch
new file mode 100644
index 000000000000..8ed58ed681f7
--- /dev/null
+++ b/mail-client/claws-mail-rssyl/files/claws-mail-rssyl-0.27-newline_hiccup.patch
@@ -0,0 +1,16 @@
+Index: src/strreplace.c
+===================================================================
+RCS file: /home/claws-mail/plugins/rssyl/src/Attic/strreplace.c,v
+retrieving revision 1.1.2.7
+diff -u -B -r1.1.2.7 strreplace.c
+--- src/strreplace.c	28 Oct 2009 08:28:43 -0000	1.1.2.7
++++ src/strreplace.c	13 Jul 2010 19:23:32 -0000
+@@ -112,7 +112,7 @@
+ 	memset(new, '\0', strlen(str) + 1);
+ 
+ 	while( *c != '\0' ) {
+-		if( !isspace(*c) || *c == ' ' ) {
++		if( !isspace(*c) || *c == ' ' || *c == '\n' ) {
+ 			*new_ptr = *c;
+ 			new_ptr++;
+ 		}