diff options
author | Michael Januszewski <spock@gentoo.org> | 2004-01-20 20:04:18 +0000 |
---|---|---|
committer | Michael Januszewski <spock@gentoo.org> | 2004-01-20 20:04:18 +0000 |
commit | b2961d21ea905a88d6b03bfc0e43e551a7cc38fe (patch) | |
tree | 685b72fbf077e0a4520a08a4b07a1ae507abdfa6 /app-admin/gkrellm | |
parent | Bumped to 3.50, added metadata.xml, fixed dates in headers of nmap ebuilds, r... (diff) | |
download | historical-b2961d21ea905a88d6b03bfc0e43e551a7cc38fe.tar.gz historical-b2961d21ea905a88d6b03bfc0e43e551a7cc38fe.tar.bz2 historical-b2961d21ea905a88d6b03bfc0e43e551a7cc38fe.zip |
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
Diffstat (limited to 'app-admin/gkrellm')
-rw-r--r-- | app-admin/gkrellm/ChangeLog | 13 | ||||
-rw-r--r-- | app-admin/gkrellm/Manifest | 22 | ||||
-rw-r--r-- | app-admin/gkrellm/files/gkrellm-2.1.24-dotkeep.patch | 15 | ||||
-rw-r--r-- | app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch | 33 | ||||
-rw-r--r-- | app-admin/gkrellm/gkrellm-1.2.13.ebuild | 4 | ||||
-rw-r--r-- | app-admin/gkrellm/gkrellm-2.1.10.ebuild | 6 | ||||
-rw-r--r-- | app-admin/gkrellm/gkrellm-2.1.21.ebuild | 6 | ||||
-rw-r--r-- | app-admin/gkrellm/gkrellm-2.1.22.ebuild | 6 | ||||
-rw-r--r-- | app-admin/gkrellm/gkrellm-2.1.23.ebuild | 4 | ||||
-rw-r--r-- | app-admin/gkrellm/gkrellm-2.1.24.ebuild | 8 |
10 files changed, 92 insertions, 25 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/Manifest b/app-admin/gkrellm/Manifest index 174e4be70d7f..34db8ca58a22 100644 --- a/app-admin/gkrellm/Manifest +++ b/app-admin/gkrellm/Manifest @@ -1,15 +1,17 @@ -MD5 81f7614672fcaed18832f057f94ea834 ChangeLog 9517 -MD5 ba737436adbc080cfc32870c2cb440e3 gkrellm-1.2.13.ebuild 916 -MD5 c7dcb8442cab2dd0d8e7da28ff960ae4 gkrellm-2.1.22.ebuild 1668 -MD5 fb96454ef242779f384613f59c511310 gkrellm-2.1.21.ebuild 1665 -MD5 6313d6896b8cf8df7d1ffc798d3ca83d gkrellm-2.1.23.ebuild 1658 -MD5 0cbfbeeb375623e66000ec9d511e8b1a gkrellm-2.1.10.ebuild 1571 -MD5 cb09e54da1ba62b628aa58e20ceb5fe2 gkrellm-2.1.24.ebuild 1694 +MD5 0db184b54d840f88f76e2e4e910b4af2 gkrellm-2.1.22.ebuild 1660 +MD5 d6797eddf608c31e3b12eb9bd803ca77 gkrellm-2.1.24.ebuild 1805 +MD5 a40c2d236d4851ecfac318d3032e828a gkrellm-2.1.10.ebuild 1566 +MD5 9ba1a7da42e95f7e34c61a63339cc432 gkrellm-2.1.21.ebuild 1657 +MD5 0fa42be870ad22b7ed515ec859cdb908 gkrellm-1.2.13.ebuild 917 +MD5 fa6815c0c292037a32944c2d1707f9f2 gkrellm-2.1.23.ebuild 1658 +MD5 4c217ea4829632908d8822bb6b41819d ChangeLog 10189 MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223 -MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67 +MD5 1812db9338503393b3d005d6f1b7f6e7 files/gkrellm-2.1.24-mail.patch 956 MD5 cafab2b9743941916312f01b8f64cffd files/gkrellmd 598 -MD5 2ce5d3981d93668e61a79b5080cb9433 files/digest-gkrellm-2.1.22 67 -MD5 c5d8fc720276fdf771751c4e12521c6d files/digest-gkrellm-2.1.21 67 +MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67 +MD5 169be0da4d05d6921fb6fde1b5d3592d files/gkrellm-2.1.24-dotkeep.patch 483 MD5 7080ee73719d75a573216e6661b04032 files/digest-gkrellm-2.1.10 67 +MD5 c5d8fc720276fdf771751c4e12521c6d files/digest-gkrellm-2.1.21 67 +MD5 2ce5d3981d93668e61a79b5080cb9433 files/digest-gkrellm-2.1.22 67 MD5 4f57be0fd7a887338b41e05de34e85ef files/digest-gkrellm-2.1.23 67 MD5 64f896d97c7d4429a564181ec839578e files/digest-gkrellm-2.1.24 67 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 |