amd64 stable wrt #212787

(Portage version: 2.1.4.4)

6 files changed, 9 insertions, 256 deletions

diff --git a/net-nntp/slrn/ChangeLog b/net-nntp/slrn/ChangeLog
index 480168e879ab..b028f3d5a9ac 100644
--- a/net-nntp/slrn/ChangeLog
+++ b/net-nntp/slrn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/slrn
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/ChangeLog,v 1.14 2008/03/10 11:15:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/ChangeLog,v 1.15 2008/03/10 14:02:31 drac Exp $
+
+  10 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  -files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff, -files/0.9.8.1-utf8.patch,
+  -files/0.9.8.1/slrn-0.9.8.1-fetch.diff, -slrn-0.9.8.1.ebuild,
+  slrn-0.9.8.1_p1.ebuild:
+  amd64 stable wrt #212787
 
   10 Mar 2008; Raúl Porcel <armin76@gentoo.org> slrn-0.9.8.1_p1.ebuild:
   alpha/ia64/sparc stable wrt #212787
diff --git a/net-nntp/slrn/files/0.9.8.1-utf8.patch b/net-nntp/slrn/files/0.9.8.1-utf8.patch
deleted file mode 100644
index 107dd5e2d715..000000000000
--- a/net-nntp/slrn/files/0.9.8.1-utf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/misc.c
-+++ src/misc.c
-@@ -458,7 +458,7 @@
-    
-    while (s1 < smax)
-      {
--	if ((*s1 & 0x80) && (eight_bit > (unsigned int) *s1))
-+	if ((*s1 & 0x80) && ((eight_bit > (unsigned int) *s1) || (SLsmg_Is_Unicode)))
- 	  {
- 	     if (s != (char *) s1)
- 	       SLsmg_write_nchars (s, (unsigned int) ((char *)s1 - s));
diff --git a/net-nntp/slrn/files/0.9.8.1/slrn-0.9.8.1-fetch.diff b/net-nntp/slrn/files/0.9.8.1/slrn-0.9.8.1-fetch.diff
deleted file mode 100644
index a6aa030f6528..000000000000
--- a/net-nntp/slrn/files/0.9.8.1/slrn-0.9.8.1-fetch.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- slrn-0.9.8.1/src/slrnpull.c	2004-02-28 23:08:17.000000000 +0100
-+++ slrn/src/slrnpull.c	2004-10-10 01:42:31.000000000 +0200
-@@ -1647,7 +1647,7 @@
- 	    || (((unsigned int)server_max <= gmax) && (gmin <= gmax)))
- 	  {
- 	     log_message (_("%s: no new articles available."), g->name);
--	     return 0;
-+	     goto fetch_marked_bodies;
- 	  }
- 	
- 	Num_Duplicates = 0;
-@@ -1667,7 +1667,7 @@
- 	     g->max = g->server_max;
- 	     log_message (_("%s: No new articles available."), g->name);
- 	     slrn_free ((char *) numbers);
--	     return 0;
-+	     goto fetch_marked_bodies;
- 	  }
- 	
- 	log_message (_("%s: %u articles available."), g->name, num_numbers - i);
-@@ -1716,7 +1716,8 @@
-      }
- 
-    /* Now, fetch marked article bodies. */
--   
-+
-+   fetch_marked_bodies:
-    /* Don't request bodies that are no longer there. */
-    if (server_min > 1)
-      g->requests = slrn_ranges_remove (g->requests, 1, server_min-1);
diff --git a/net-nntp/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff b/net-nntp/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff
deleted file mode 100644
index 1e02ad3b968f..000000000000
--- a/net-nntp/slrn/files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -ru slrn-0.9.8.1.orig/src/group.c slrn-0.9.8.1/src/group.c
---- slrn-0.9.8.1.orig/src/group.c	2004-08-15 23:09:31.000000000 +0200
-+++ slrn-0.9.8.1/src/group.c	2004-11-05 23:01:51.391610936 +0100
-@@ -3,7 +3,7 @@
-  This file is part of SLRN.
- 
-  Copyright (c) 1994, 1999 John E. Davis <davis@space.mit.edu>
-- Copyright (c) 2001-2003 Thomas Schultz <tststs@gmx.de>
-+ Copyright (c) 2001-2004 Thomas Schultz <tststs@gmx.de>
- 
-  This program is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by the Free
-@@ -2605,7 +2605,10 @@
- 	if ((p == pmax) || (p == vline))
- 	  continue;
-      
--	vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
-+	if (vline[vlen-1] == '\n')
-+	  vline[vlen-1] = 0;
-+	else
-+	  vline[vlen] = 0;
- 
- 	if (-1 == add_group (vline, (unsigned int) (p - vline),
- 			     ((ch == '!') ? GROUP_UNSUBSCRIBED : 0), 0, 0))
-diff -ru slrn-0.9.8.1.orig/src/misc.c slrn-0.9.8.1/src/misc.c
---- slrn-0.9.8.1.orig/src/misc.c	2004-09-27 23:30:35.000000000 +0200
-+++ slrn-0.9.8.1/src/misc.c	2004-11-05 23:02:09.519855024 +0100
-@@ -1165,8 +1165,11 @@
- 	     if (vlen == 0) continue;
- 	     
- 	     line = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
--	     slrn_strncpy (line, vline, vlen);
--	     line[vlen-1] = 0;		/* kill \n and NULL terminate */
-+	     strncpy (line, vline, vlen);
-+	     if (line[vlen-1] == '\n')
-+	       line[vlen-1] = 0;
-+	     else
-+	       line[vlen] = 0;
- 
- 	     if (header)
- 	       {
-diff -ru slrn-0.9.8.1.orig/src/post.c slrn-0.9.8.1/src/post.c
---- slrn-0.9.8.1.orig/src/post.c	2004-09-28 11:05:54.000000000 +0200
-+++ slrn-0.9.8.1/src/post.c	2004-11-05 23:02:53.936102728 +0100
-@@ -467,7 +467,10 @@
-    linenum = 0;
-    while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
-      {
--	vline[vlen-1] = 0;
-+	if (vline[vlen-1] == '\n')
-+	  vline[vlen-1] = 0;
-+	else
-+	  vline[vlen] = 0;
- 	linenum++;
- 	if (0 == slrn_case_strncmp ((unsigned char *)vline,
- 				    (unsigned char *) "Cc: ", 4))
-@@ -540,7 +543,10 @@
- 
-    while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
-      {
--	vline[vlen-1] = 0;
-+	if (vline[vlen-1] == '\n')
-+	  vline[vlen-1] = 0;
-+	else
-+	  vline[vlen] = 0;	
- 	linenum++;
- 	if (linenum == cc_line) continue;
- 	if (is_empty_header (vline)) continue;
-@@ -593,7 +599,10 @@
- 
-    while (NULL != (vline = vgets (vp, &vlen)))
-      {
--	vline[vlen-1] = 0;
-+	if (vline[vlen-1] == '\n')
-+	  vline[vlen-1] = 0;
-+	else
-+	  vline[vlen] = 0;	
- 	fputs (vline, pp);
- 	fputs ("\n", pp);
-      }
-@@ -1411,8 +1420,11 @@
- 	if (vlen == 0) continue;
- 
- 	linep = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
--	slrn_strncpy (linep, vline, vlen);
--	linep[vlen-1] = 0;	/* kill \n and NULL terminate */
-+	strncpy (linep, vline, vlen);
-+	if (linep[vlen-1] == '\n')
-+	  linep[vlen-1] = 0;	/* kill \n and NULL terminate */
-+	else
-+	  linep[vlen] = 0;
- 	
- 	if (header)
- 	  {
-diff -ru slrn-0.9.8.1.orig/src/slrnpull.c slrn-0.9.8.1/src/slrnpull.c
---- slrn-0.9.8.1.orig/src/slrnpull.c	2004-02-28 23:08:17.000000000 +0100
-+++ slrn-0.9.8.1/src/slrnpull.c	2004-11-05 23:03:18.859313824 +0100
-@@ -3273,7 +3273,10 @@
- 	
- 	if (NULL != (vline = vgets (vp, &vlen)))
- 	  {
--	     vline[vlen] = 0; /* make sure line is NULL terminated */
-+	     if (vline[vlen-1] == '\n')
-+	       vline[vlen-1] = 0; /* make sure line is NULL terminated */
-+	     else
-+	       vline[vlen] = 0;
- 	     group->headers = slrn_ranges_from_newsrc_line (vline);
- 	  }
- 	
-@@ -3382,7 +3385,10 @@
- 	     if (NULL == (group = find_group_type (vline)))
- 	       continue;
- 	     
--	     vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
-+	     if (vline[vlen-1] == '\n')
-+	       vline[vlen-1] = 0;
-+	     else
-+	       vline[vlen] = 0;
- 	     
- 	     r = slrn_ranges_from_newsrc_line (p+1);
- 	     group->requests = slrn_ranges_merge (group->requests, r);
-diff -ru slrn-0.9.8.1.orig/src/spool.c slrn-0.9.8.1/src/spool.c
---- slrn-0.9.8.1.orig/src/spool.c	2004-08-15 22:48:13.000000000 +0200
-+++ slrn-0.9.8.1/src/spool.c	2004-11-05 23:04:17.628379568 +0100
-@@ -1757,7 +1757,10 @@
-    
-    if (NULL != (vline = vgets (vp, &vlen)))
-      {
--	vline[vlen] = 0; /* make sure line is NULL terminated */
-+	if (vline[vlen-1] == '\n')
-+	  vline[vlen-1] = 0; /* make sure line is NULL terminated */
-+	else
-+	  vline[vlen] = 0;
- 	retval = slrn_ranges_from_newsrc_line (vline);
-      }
-    
-@@ -1787,8 +1790,11 @@
- 	if ((p == pmax) || (p == vline) ||
- 	    (strncmp(vline, group, (p-vline))))
- 	  continue;
--     
--	vline[vlen-1] = 0;	       /* kill \n and NULL terminate */
-+
-+	if (vline[vlen-1] == '\n')
-+	  vline[vlen-1] = 0;
-+	else
-+	  vline[vlen] = 0;
- 	
- 	retval = slrn_ranges_from_newsrc_line (p+1);
- 	break;
diff --git a/net-nntp/slrn/slrn-0.9.8.1.ebuild b/net-nntp/slrn/slrn-0.9.8.1.ebuild
deleted file mode 100644
index 273c08452da7..000000000000
--- a/net-nntp/slrn/slrn-0.9.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/slrn-0.9.8.1.ebuild,v 1.8 2007/03/11 17:57:59 swegener Exp $
-
-inherit eutils
-
-# Upstream patches from http://slrn.sourceforge.net/patches/
-# ${FILESDIR}/${PV}/${P}-<name>.diff
-SLRN_PATCHES="fetch lastchar2"
-
-DESCRIPTION="s-lang Newsreader"
-HOMEPAGE="http://slrn.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="ssl nls unicode uudeview"
-
-RDEPEND="virtual/mta
-	>=app-arch/sharutils-4.2.1
-	=sys-libs/slang-1.4*
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-DEPEND="${RDEPEND}
-	uudeview? ( dev-libs/uulib )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/slang unicode
-	then
-		eerror "For USE=\"unicode\" support you need to have your sys-libs/slang also compiled"
-		eerror "with USE=\"unicode\" support."
-		die "sys-libs/slang with USE=\"unicode\" support needed"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	for i in ${SLRN_PATCHES}
-	do
-		epatch "${FILESDIR}"/${PV}/${P}-${i}.diff
-	done
-
-	use unicode && epatch "${FILESDIR}"/${PV}-utf8.patch
-}
-
-src_compile() {
-	econf \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-slrnpull \
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_with uudeview) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild b/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild
index 72753c72fd5c..416f6b88419b 100644
--- a/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild
+++ b/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild,v 1.5 2008/03/10 11:15:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild,v 1.6 2008/03/10 14:02:31 drac Exp $
 
 MY_P=${P/_p/pl}
 
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.sourceforge.net/patches/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="nls ssl uudeview"
 
 RDEPEND="virtual/mta