version bump

4 files changed, 85 insertions, 4 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 32a2f7053c04..fb4f09e7198c 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,11 +1,21 @@
 # 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.22 2002/12/13 10:55:54 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.23 2002/12/14 00:39:17 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gkrellm-2.1.2 (13 Dec 2002)
+
+  13 Dec 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.2.ebuild
+  files/digest-gkrellm-2.1.2 :
+
+  Version bump, and uses the "gtk2" flag instead of "gtk" now, because the
+  GUI portion is gtk2.  Thanks to: absinthe@pobox.com (Dylan Carlson) in bug
+  #12122
  
 *gkrellm-2.1.1 (25 Nov 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
   25 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.1.ebuild
   ChangeLog files/digest-gkrellm-2.1.1. :
 
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.2 b/app-admin/gkrellm/files/digest-gkrellm-2.1.2
new file mode 100644
index 000000000000..e8f3d2ecab4b
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.1.2
@@ -0,0 +1 @@
+MD5 404de9f7de2be8f464a3f97770a339a0 gkrellm-2.1.2.tar.bz2 541399
diff --git a/app-admin/gkrellm/gkrellm-2.1.0.ebuild b/app-admin/gkrellm/gkrellm-2.1.0.ebuild
index 1ab832593464..ec08310a5c7c 100644
--- a/app-admin/gkrellm/gkrellm-2.1.0.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2002/12/09 04:17:34 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.0.ebuild,v 1.6 2002/12/14 00:39:17 seemant Exp $
 
 DESCRIPTION="Single process stack of various system monitors"
 SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc "
+KEYWORDS="x86 ppc ~alpha sparc"
 IUSE="gtk nls"
 
 DEPEND="gtk? >=x11-libs/gtk+-2.0.5 : =dev-libs/glib-1.2*"
diff --git a/app-admin/gkrellm/gkrellm-2.1.2.ebuild b/app-admin/gkrellm/gkrellm-2.1.2.ebuild
new file mode 100644
index 000000000000..177bf0405c20
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.1.2.ebuild
@@ -0,0 +1,70 @@
+# 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.2.ebuild,v 1.1 2002/12/14 00:39:17 seemant Exp $
+
+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"
+IUSE="gtk2 nls"
+
+DEPEND="gtk2? >=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 gtk2
+	then
+		emake || die
+	else
+		cd ${S}/server
+		emake glib12=1 || die
+	fi
+}
+
+src_install() {
+	touch .keep
+	dodir /usr/{bin,include,share/man}
+
+	if use gtk2
+	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
+}