Fixed dates in the headers, removed ~mips from ebuilds for 2.1.10, 2.1.21, 2.1.22 (unsatisfied dependency on >=x11-libs/gtk+-2.0.5), added two patches: dotkeep and mail

9 files changed, 80 insertions, 15 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 8ab228850cd1..7bd051c1258e 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.65 2004/01/15 22:33:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.66 2004/01/20 20:04:18 spock Exp $
+
+  20 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
+  gkrellm-1.2.13.ebuild, gkrellm-2.1.10.ebuild, gkrellm-2.1.21.ebuild,
+  gkrellm-2.1.22.ebuild, gkrellm-2.1.23.ebuild, gkrellm-2.1.24.ebuild,
+  files/gkrellm-2.1.24-dotkeep.patch, files/gkrellm-2.1.24-mail.patch:
+  Fixed dates in the headers, removed ~mips from ebuilds for 2.1.10, 2.1.21,
+  2.1.22 (unsatisfied dependency on >=x11-libs/gtk+-2.0.5), added two patches:
+  dotkeep (makes gkrellm skip the .keep file and not try to load it as a plugin
+  - this closes bug #38405) and mail (fixes counting the number of messages in
+  mbox mailboxes in case the msgs are buggy and don't have the closing
+  separator).
 
   15 Jan 2004; Aron Griffis <agriffis@gentoo.org> gkrellm-2.1.24.ebuild:
   stable on alpha
diff --git a/app-admin/gkrellm/files/gkrellm-2.1.24-dotkeep.patch b/app-admin/gkrellm/files/gkrellm-2.1.24-dotkeep.patch
new file mode 100644
index 000000000000..9fa5a59ef2a2
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.1.24-dotkeep.patch
@@ -0,0 +1,15 @@
+diff -Naur gkrellm-2.1.24/src/plugins.c gkrellm-2.1.24-new/src/plugins.c
+--- gkrellm-2.1.24/src/plugins.c	2003-12-14 02:22:50.000000000 +0100
++++ gkrellm-2.1.24-new/src/plugins.c	2004-01-20 15:59:42.625278072 +0100
+@@ -1057,6 +1057,11 @@
+ 		return;
+ 	while ((name = (gchar *) g_dir_read_name(dir)) != NULL)
+ 		{
++
++		if (strcmp(name, ".keep") == 0) {
++			continue;
++		}
++
+ 		/* If there's a libtool .la archive, won't want to load this .so
+ 		*/
+ 		if (   !string_suffix(name, "la")
diff --git a/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch b/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch
new file mode 100644
index 000000000000..24c821c89d23
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch
@@ -0,0 +1,33 @@
+diff -Naur gkrellm-2.1.24-orig/src/mail.c gkrellm-2.1.24/src/mail.c
+--- gkrellm-2.1.24-orig/src/mail.c	2003-12-19 05:57:01.000000000 +0100
++++ gkrellm-2.1.24/src/mail.c	2004-01-20 16:47:09.000000000 +0100
+@@ -1376,7 +1378,15 @@
+ 		mbox->old_mail_count = 0;
+ 		while(fgets(buf, sizeof(buf), f))
+ 			{
+-			if (is_multipart && !in_header)
++		
++			if (is_From_line(mbox, buf))
++				{
++				mbox->mail_count += 1;
++				in_header = TRUE;
++				marked_read = FALSE;
++				is_multipart = FALSE;
++				}
++			else if (is_multipart && !in_header)
+ 				{
+ 				/* Skip to last line of multipart mail */
+ 				if (strncmp(buf,mpart_sep,strlen(mpart_sep))==0)
+@@ -1387,12 +1397,6 @@
+ 				in_header = FALSE;
+ 				mbox->is_internal = FALSE;
+ 				}
+-			else if (is_From_line(mbox, buf))
+-				{
+-				mbox->mail_count += 1;
+-				in_header = TRUE;
+-				marked_read = FALSE;
+-				}
+ 			else if (in_header && status_is_old(buf) && !marked_read)
+ 				{
+ 				mbox->old_mail_count += 1;
diff --git a/app-admin/gkrellm/gkrellm-1.2.13.ebuild b/app-admin/gkrellm/gkrellm-1.2.13.ebuild
index dce7b22f91d1..158e2726b417 100644
--- a/app-admin/gkrellm/gkrellm-1.2.13.ebuild
+++ b/app-admin/gkrellm/gkrellm-1.2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.13.ebuild,v 1.15 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.13.ebuild,v 1.16 2004/01/20 20:04:18 spock Exp $
 
 DESCRIPTION="Single process stack of various system monitors"
 SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
diff --git a/app-admin/gkrellm/gkrellm-2.1.10.ebuild b/app-admin/gkrellm/gkrellm-2.1.10.ebuild
index 7781245548ca..8cbffc2993b8 100644
--- a/app-admin/gkrellm/gkrellm-2.1.10.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.10.ebuild,v 1.8 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.10.ebuild,v 1.9 2004/01/20 20:04:18 spock Exp $
 
 IUSE="gtk gtk2 nls"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha sparc ~hppa ~mips"
+KEYWORDS="x86 ppc ~alpha sparc ~hppa"
 
 DEPEND=">=sys-apps/sed-4
 	gtk? (  >=x11-libs/gtk+-2.0.5 )
diff --git a/app-admin/gkrellm/gkrellm-2.1.21.ebuild b/app-admin/gkrellm/gkrellm-2.1.21.ebuild
index dc88227c562a..3ce02324dc95 100644
--- a/app-admin/gkrellm/gkrellm-2.1.21.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.21.ebuild,v 1.4 2003/12/14 14:37:49 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.21.ebuild,v 1.5 2004/01/20 20:04:18 spock Exp $
 
 IUSE="gtk gtk2 nls"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha ~sparc ~hppa ~mips"
+KEYWORDS="x86 ppc alpha ~sparc ~hppa"
 
 DEPEND=">=sys-apps/sed-4
 	gtk? (  >=x11-libs/gtk+-2.0.5 )
diff --git a/app-admin/gkrellm/gkrellm-2.1.22.ebuild b/app-admin/gkrellm/gkrellm-2.1.22.ebuild
index a6cc5cb3a387..5547105def8b 100644
--- a/app-admin/gkrellm/gkrellm-2.1.22.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.22.ebuild,v 1.1 2003/12/14 14:37:10 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.22.ebuild,v 1.2 2004/01/20 20:04:18 spock Exp $
 
 IUSE="gtk gtk2 nls"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~mips"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
 
 DEPEND=">=sys-apps/sed-4
 	gtk? (  >=x11-libs/gtk+-2.0.5 )
diff --git a/app-admin/gkrellm/gkrellm-2.1.23.ebuild b/app-admin/gkrellm/gkrellm-2.1.23.ebuild
index 2c7d2034a353..e0f636a759a9 100644
--- a/app-admin/gkrellm/gkrellm-2.1.23.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.23.ebuild,v 1.3 2003/12/29 11:53:38 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.23.ebuild,v 1.4 2004/01/20 20:04:18 spock Exp $
 
 IUSE="gtk gtk2 nls"
 
diff --git a/app-admin/gkrellm/gkrellm-2.1.24.ebuild b/app-admin/gkrellm/gkrellm-2.1.24.ebuild
index bca9c8d8ecd0..5e62fd94e620 100644
--- a/app-admin/gkrellm/gkrellm-2.1.24.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.24.ebuild,v 1.3 2004/01/15 22:33:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.24.ebuild,v 1.4 2004/01/20 20:04:18 spock Exp $
 
 IUSE="X nls ssl"
 
@@ -19,6 +19,12 @@ DEPEND=">=sys-apps/sed-4
 
 RDEPEND="${DEPEND} nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${P}.tar.bz2
+	epatch ${FILESDIR}/${P}-dotkeep.patch
+	epatch ${FILESDIR}/${P}-mail.patch
+}
+
 src_compile() {
 	local myconf
 	if [ ! "`use nls`" ]; then