version bump

6 files changed, 87 insertions, 56 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index d2327186e81d..bdaffa2c3406 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2002/10/17 13:18:24 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.16 2002/10/20 23:12:45 seemant Exp $
+
+*gkrellm-2.1.0 (20 Oct 2002)
+
+  20 Oct 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.0.ebuild
+  files/digest-gkrellm-2.1.0 :
+
+  Version bump, thanks to: pilux@gmx.net (Andreas Dolfen) in bug #9370.
 
 *gkrellm-2.0.4 (15 Oct 2002)
 
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.0.2 b/app-admin/gkrellm/files/digest-gkrellm-2.0.2
deleted file mode 100644
index 8e48877cbc73..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cbb9c2d9fc4026f9aced85c52d46b39 gkrellm-2.0.2.tar.bz2 505906
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.0 b/app-admin/gkrellm/files/digest-gkrellm-2.1.0
new file mode 100644
index 000000000000..9fcc005b5029
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.1.0
@@ -0,0 +1 @@
+MD5 5c89462d187d4ae3f157665cbb135381 gkrellm-2.1.0.tar.bz2 536422
diff --git a/app-admin/gkrellm/gkrellm-2.0.2.ebuild b/app-admin/gkrellm/gkrellm-2.0.2.ebuild
deleted file mode 100644
index 16c2a4109b53..000000000000
--- a/app-admin/gkrellm/gkrellm-2.0.2.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.2.ebuild,v 1.5 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 alpha"
-
-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
index d0f69c2b4a73..98ccdb35c9cf 100644
--- a/app-admin/gkrellm/gkrellm-2.0.4.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.0.4.ebuild
@@ -1,15 +1,17 @@
 # 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.4.ebuild,v 1.3 2002/10/17 13:18:24 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.0.4.ebuild,v 1.4 2002/10/20 23:12:45 seemant Exp $
+
+IUSE="gtk 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/"
-IUSE="gtk nls"
+
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~sparc64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~sparc64"
 
 DEPEND="gtk? >=x11-libs/gtk+-2.0.5 : =dev-libs/glib-1.2*"
 
diff --git a/app-admin/gkrellm/gkrellm-2.1.0.ebuild b/app-admin/gkrellm/gkrellm-2.1.0.ebuild
new file mode 100644
index 000000000000..819e6efa8dec
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.1.0.ebuild
@@ -0,0 +1,73 @@
+# 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.1.0.ebuild,v 1.1 2002/10/20 23:12:45 seemant Exp $
+
+IUSE="gtk 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 ~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
+}