Version bumped and x86 stable

7 files changed, 144 insertions, 30 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 7bd051c1258e..07180a3583cc 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.66 2004/01/20 20:04:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.67 2004/01/22 19:10:05 mholzer Exp $
+
+*gkrellm-2.1.25 (22 Jan 2004)
+
+  22 Jan 2004; Martin Holzer <mholzer@gentoo.org> gkrellm-2.1.24.ebuild,
+  gkrellm-2.1.25.ebuild, files/gkrellm-2.1.24-dotkeep.patch,
+  files/gkrellm-dotkeep.patch:
+  Version bumped and x86 stable
 
   20 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
   gkrellm-1.2.13.ebuild, gkrellm-2.1.10.ebuild, gkrellm-2.1.21.ebuild,
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 34db8ca58a22..c86442ffb176 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,17 +1,19 @@
+MD5 0fa42be870ad22b7ed515ec859cdb908 gkrellm-1.2.13.ebuild 917
 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 874cd886e4828e61189d7631514a4de1 gkrellm-2.1.25.ebuild 1774
+MD5 6ba68204859547416625793d9ff5b696 gkrellm-2.1.24.ebuild 1808
 MD5 9ba1a7da42e95f7e34c61a63339cc432 gkrellm-2.1.21.ebuild 1657
-MD5 0fa42be870ad22b7ed515ec859cdb908 gkrellm-1.2.13.ebuild 917
+MD5 a40c2d236d4851ecfac318d3032e828a gkrellm-2.1.10.ebuild 1566
 MD5 fa6815c0c292037a32944c2d1707f9f2 gkrellm-2.1.23.ebuild 1658
-MD5 4c217ea4829632908d8822bb6b41819d ChangeLog 10189
 MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
-MD5 1812db9338503393b3d005d6f1b7f6e7 files/gkrellm-2.1.24-mail.patch 956
+MD5 43b6a2db244f50919d3e4ca87aa781b5 ChangeLog 10420
+MD5 4f57be0fd7a887338b41e05de34e85ef files/digest-gkrellm-2.1.23 67
+MD5 2ce5d3981d93668e61a79b5080cb9433 files/digest-gkrellm-2.1.22 67
+MD5 7080ee73719d75a573216e6661b04032 files/digest-gkrellm-2.1.10 67
 MD5 cafab2b9743941916312f01b8f64cffd files/gkrellmd 598
 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
+MD5 1812db9338503393b3d005d6f1b7f6e7 files/gkrellm-2.1.24-mail.patch 956
+MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-dotkeep.patch 894
+MD5 c5d8fc720276fdf771751c4e12521c6d files/digest-gkrellm-2.1.21 67
+MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.25 b/app-admin/gkrellm/files/digest-gkrellm-2.1.25
new file mode 100644
index 000000000000..e75108ee1a30
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.1.25
@@ -0,0 +1 @@
+MD5 1241d0a7c17650ded440f21463ce0403 gkrellm-2.1.25.tar.bz2 633685
diff --git a/app-admin/gkrellm/files/gkrellm-2.1.24-dotkeep.patch b/app-admin/gkrellm/files/gkrellm-2.1.24-dotkeep.patch
deleted file mode 100644
index 9fa5a59ef2a2..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.1.24-dotkeep.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-dotkeep.patch b/app-admin/gkrellm/files/gkrellm-dotkeep.patch
new file mode 100644
index 000000000000..835c14128eb0
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-dotkeep.patch
@@ -0,0 +1,33 @@
+diff -Naur src/mail.c.org src/mail.c
+--- src/mail.c.org	2003-12-19 05:57:01.000000000 +0100
++++ 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-2.1.24.ebuild b/app-admin/gkrellm/gkrellm-2.1.24.ebuild
index 5e62fd94e620..178a9a7643af 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.4 2004/01/20 20:04:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.24.ebuild,v 1.5 2004/01/22 19:10:05 mholzer Exp $
 
 IUSE="X nls ssl"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc alpha ~sparc ~hppa"
+KEYWORDS="x86 ~ppc alpha ~sparc ~hppa"
 
 DEPEND=">=sys-apps/sed-4
 	ssl? ( dev-libs/openssl )
@@ -20,8 +20,9 @@ DEPEND=">=sys-apps/sed-4
 RDEPEND="${DEPEND} nls? ( sys-devel/gettext )"
 
 src_unpack() {
-	unpack ${P}.tar.bz2
-	epatch ${FILESDIR}/${P}-dotkeep.patch
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-dotkeep.patch
 	epatch ${FILESDIR}/${P}-mail.patch
 }
 
diff --git a/app-admin/gkrellm/gkrellm-2.1.25.ebuild b/app-admin/gkrellm/gkrellm-2.1.25.ebuild
new file mode 100644
index 000000000000..77413c92f9ad
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.1.25.ebuild
@@ -0,0 +1,85 @@
+# 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.25.ebuild,v 1.1 2004/01/22 19:10:05 mholzer Exp $
+
+IUSE="X nls ssl"
+
+S=${WORKDIR}/${P/a/}
+DESCRIPTION="Single process stack of various system monitors"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
+HOMEPAGE="http://www.gkrellm.net/"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
+
+DEPEND=">=sys-apps/sed-4
+	ssl? ( dev-libs/openssl )
+	X? (  >=x11-libs/gtk+-2.0.5 )"
+
+RDEPEND="${DEPEND} nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-dotkeep.patch
+}
+
+src_compile() {
+	local myconf
+	if [ ! "`use nls`" ]; then
+		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
+	fi
+
+	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
+
+	if use X
+	then
+	use ssl || myconf="without-ssl=yes"
+		PREFIX=/usr emake ${myconf} || die
+	else
+		cd ${S}/server
+		emake glib12=1 || die
+	fi
+}
+
+src_install() {
+	dodir /usr/{bin,include,share/man}
+
+	if use X
+	then
+		keepdir /usr/share/gkrellm2/themes
+		keepdir /usr/lib/gkrellm2/plugins
+
+		make DESTDIR=${D} install \
+			INSTALLDIR=${D}/usr/bin \
+			MANDIR=${D}/usr/share/man/man1 \
+			INCLUDEDIR=${D}/usr/include \
+			LOCALEDIR=${D}/usr/share/locale \
+			PKGCONFIGDIR=${D}/usr/lib/pkgconfig
+
+		cd ${S}
+		mv gkrellm.1 gkrellm2.1
+
+		mv src/gkrellm src/gkrellm2
+		dobin src/gkrellm2
+		rm -f ${D}/usr/bin/gkrellm
+	else
+		cd ${S}/server
+		dobin gkrellmd
+		cd ${S}
+		rm gkrellm.1
+	fi
+
+	rm -f ${D}/usr/share/man/man1/*
+	doman *.1
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/gkrellmd
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	dodoc COPYRIGHT CREDITS INSTALL README Changelog
+	dohtml *.html
+}