6 files changed, 102 insertions, 14 deletions
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index f9a41851375a..3dbc881c4541 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.87 2004/05/14 01:04:48 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.88 2004/06/01 19:46:06 mholzer Exp $
+
+*gkrellm-2.2.0 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrellm-2.2.0.ebuild:
+  Version bumped. Cloeses 51313
 
   14 May 2004; Lars Weiler <pylon@gentoo.org> gkrellm-2.1.28-r1.ebuild:
   Stable on ppc
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 966cd0462be7..22f9e1fa4556 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,14 +1,16 @@
+MD5 2df65fdc5cc53c5caabc36218029ef12 ChangeLog 12831
+MD5 0fa42be870ad22b7ed515ec859cdb908 gkrellm-1.2.13.ebuild 917
+MD5 f656485ff648fec748c0a7cfdd6cb68a gkrellm-2.2.0.ebuild 1716
+MD5 172f286fe5296f61d25ca56097e2ddbe gkrellm-2.1.25.ebuild 1780
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 a9d75c997b10998680dde12317ca0384 gkrellm-2.1.28-r1.ebuild 1761
+MD5 8ab5ecd96d86a6824c28ce015394a529 gkrellm-2.1.28.ebuild 1704
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
 MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67
+MD5 01a75ae88987b6571ae89ccb1c345c34 files/digest-gkrellm-2.2.0 66
 MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
-MD5 cafab2b9743941916312f01b8f64cffd files/gkrellmd 598
+MD5 d9df3e6d6e0a42c64897394c077f894c files/gkrellmd 599
+MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448
 MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
 MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28 67
 MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
-MD5 93d1003692158d9436ea51d17222bb82 files/slit_gtk+-2.4.0.patch 502
-MD5 e1e3ef078cc0c3916f8f030b7a4725ba ChangeLog 12694
-MD5 0fa42be870ad22b7ed515ec859cdb908 gkrellm-1.2.13.ebuild 917
-MD5 172f286fe5296f61d25ca56097e2ddbe gkrellm-2.1.25.ebuild 1780
-MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
-MD5 8ab5ecd96d86a6824c28ce015394a529 gkrellm-2.1.28.ebuild 1704
-MD5 a9d75c997b10998680dde12317ca0384 gkrellm-2.1.28-r1.ebuild 1761
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.0 b/app-admin/gkrellm/files/digest-gkrellm-2.2.0
new file mode 100644
index 000000000000..84a1bbebbb20
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.0
@@ -0,0 +1 @@
+MD5 354e0f878d2bc8f7fe9a1a745bf136c2 gkrellm-2.2.0.tar.bz2 663376
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
index f943ed70392a..2b3bebe44521 100644
--- a/app-admin/gkrellm/files/gkrellmd
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/files/gkrellmd,v 1.2 2003/02/14 22:07:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.3 2004/06/01 19:46:06 mholzer Exp $
 
 depend() {
 	need net
diff --git a/app-admin/gkrellm/files/slit_gtk+-2.4.0.patch b/app-admin/gkrellm/files/slit_gtk+-2.4.0.patch
index 84dafc581dbe..ebf4ace01fb8 100644
--- a/app-admin/gkrellm/files/slit_gtk+-2.4.0.patch
+++ b/app-admin/gkrellm/files/slit_gtk+-2.4.0.patch
@@ -1,6 +1,6 @@
-diff -Naur gkrellm-2.1.28/src/main.c gkrellm-2.1.28_/src/main.c
---- gkrellm-2.1.28/src/main.c	2004-04-11 07:34:37.631188496 +0200
-+++ gkrellm-2.1.28_/src/main.c	2004-04-11 07:34:24.247223168 +0200
+diff -Naur src/main.c.org src/main.c
+--- src/main.c.org	2004-04-11 07:34:37.631188496 +0200
++++ src/main.c	2004-04-11 07:34:24.247223168 +0200
 @@ -2214,8 +2214,8 @@
  
  	if (_GK.sticky_state)
diff --git a/app-admin/gkrellm/gkrellm-2.2.0.ebuild b/app-admin/gkrellm/gkrellm-2.2.0.ebuild
new file mode 100644
index 000000000000..5e2781202702
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.2.0.ebuild
@@ -0,0 +1,80 @@
+# 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.2.0.ebuild,v 1.1 2004/06/01 19:46:06 mholzer Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P/a/}
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="x86 ppc ~alpha sparc hppa amd64 ~ia64"
+IUSE="X nls ssl"
+
+DEPEND=">=sys-apps/sed-4
+	ssl? ( dev-libs/openssl )
+	X? (  >=x11-libs/gtk+-2.0.5 )"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+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
+}