version bump

6 files changed, 105 insertions, 53 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index d2a95d5aa3c8..ded9ef240600 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.13 2002/09/23 17:03:49 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.14 2002/10/15 12:29:28 seemant Exp $
+
+*gkrellm-2.0.4 (15 Oct 2002)
+
+  15 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.0.4.ebuid
+  files/digest-gkrellm-2.0.4 files/gkrellmd :
+
+  Updated version, thanks to: dnellans@cs.utah.edu (Dave Nellans) in bug
+  #9002.  Also added an initscript for gkrellmd in case users wish to
+  automatically start the daemon.  The last pleasant surprise (since the
+  gkrellmd can be run on some server), with "-gtk" the emerge process only
+  requires glib1.2 to be installed, and it will ONLY build and install the
+  daemon -- no GTK+-2* required :)
 
 *gkrellm-2.0.2 (20 Sep 2002)
 
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.0.0 b/app-admin/gkrellm/files/digest-gkrellm-2.0.0
deleted file mode 100644
index fe08dfcc5dfe..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88fbbc1f24edda03573b7f07e20fcf7e gkrellm-2.0.0.tar.bz2 503565
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.0.4 b/app-admin/gkrellm/files/digest-gkrellm-2.0.4
new file mode 100644
index 000000000000..0b2eabd5e348
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.0.4
@@ -0,0 +1 @@
+MD5 096205bee6a9ec2c5e42c7635ad41706 gkrellm-2.0.4.tar.bz2 507473
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
new file mode 100644
index 000000000000..b12f79e4eb60
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.1 2002/10/15 12:29:28 seemant Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting GNU Krell Monitor daemon"
+	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping GNU Krell Monitor daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/gkrellmd.pid --name gkrellmd
+	eend $?
+}
diff --git a/app-admin/gkrellm/gkrellm-2.0.0.ebuild b/app-admin/gkrellm/gkrellm-2.0.0.ebuild
deleted file mode 100644
index 9e4dd205db36..000000000000
--- a/app-admin/gkrellm/gkrellm-2.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.0.0.ebuild,v 1.4 2002/10/05 05:39:05 drobbins Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gkrellm.net/"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND=">=dev-libs/glib-2.0.4
-    >=x11-libs/gtk+-2.0.5"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	if [ ! "`use nls`" ]; then
-		cp Makefile Makefile.orig
-		sed -e "s:enable_nls=1:enable_nls=0:" Makefile.orig > Makefile
-	fi
-	
-	emake || die
-}
-
-src_install () {
-	dodir /usr/{bin,include,share/man}
-	dodir /usr/lib/gkrellm2/{themes,plugins}
-
-	make install \
-		INSTALLDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man/man1 \
-		INCLUDEDIR=${D}/usr/include \
-		LOCALEDIR=${D}/usr/share/locale
-
-	mv gkrellm.1 gkrellm2.1
-	
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	mv src/gkrellm src/gkrellm2
-	rm -f ${D}/usr/bin/gkrellm
-	dobin src/gkrellm2
-
-	dodoc COPYRIGHT README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.0.4.ebuild b/app-admin/gkrellm/gkrellm-2.0.4.ebuild
new file mode 100644
index 000000000000..86f49da32ca1
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.0.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.0.4.ebuild,v 1.1 2002/10/15 12:29:28 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Single process stack of various system monitors"
+SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.gkrellm.net/"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~sparc64"
+
+DEPEND="gtk? >=x11-libs/gtk+-2.0.5 : =dev-libs/glib-1.2*"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_compile() {
+	if [ ! "`use nls`" ]; then
+		cp Makefile Makefile.orig
+		sed -e "s:enable_nls=1:enable_nls=0:" Makefile.orig > Makefile
+	fi
+	
+	if use gtk
+	then
+		emake || die
+	else
+		cd ${S}/server
+		emake glib12=1 || die
+	fi
+}
+
+src_install () {
+	touch .keep
+	dodir /usr/{bin,include,share/man}
+
+	if use gtk
+	then
+		insinto /usr/lib/gkrellm2/themes
+		doins .keep
+
+		insinto /usr/lib/gkrellm2/plugins
+		doins .keep
+		make install \
+			INSTALLDIR=${D}/usr/bin \
+			MANDIR=${D}/usr/share/man/man1 \
+			INCLUDEDIR=${D}/usr/include \
+			LOCALEDIR=${D}/usr/share/locale
+
+		cd ${S}
+		mv gkrellm.1 gkrellm2.1
+		
+		mv src/gkrellm src/gkrellm2
+		rm -f ${D}/usr/bin/gkrellm
+		dobin src/gkrellm2
+	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
+
+	dodoc COPYRIGHT README Changelog
+	dohtml *.html
+}