Version bumped. Closes #35782.

5 files changed, 99 insertions, 20 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 5ccf3c24da66..8d7b50ba0d8a 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.59 2003/12/14 03:52:54 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.60 2003/12/14 14:37:10 mholzer Exp $
+
+*gkrellm-2.1.22 (14 Dec 2003)
+
+  14 Dec 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-2.1.22.ebuild,
+  metadata.xml:
+  Version bumped. Closes #35782.
 
   14 Dec 2003; Lars Weiler <pylon@gentoo.org> gkrellm-2.1.21.ebuild:
   Make stable on ppc
@@ -139,7 +145,6 @@
 
   23 Dec 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.4.ebuild
   files/digest-gkrellm-2.1.4 :
-
   Upstream bugfix release. Thanks to: jspectre@mindspring.com (johnathan
   spectre) in bug #12617 for notification of the new release.
 
@@ -166,13 +171,11 @@
 
   25 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.1.ebuild
   ChangeLog files/digest-gkrellm-2.1.1. :
-
   Version bump.
 
 *gkrellm-2.1.0 (20 Oct 2002)
 
   14 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.0.ebuild :
-
   Moved to stable for x86
 
   26 Oct 2002; Olivier Reisch <doctomoe@gentoo.org> gkrellm-2.1.0.ebuild:
@@ -180,7 +183,6 @@
 
   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)
@@ -208,68 +210,57 @@
 
   20 Sep 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.0.2.ebuild
   files/digest-gkrellm-2.0.2 :
-
   Version bump.
 
 *gkrellm-2.0.0 (23 Aug 2002)
 
   23 Aug 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.0.0.ebuild
   files/digest-gkrellm-2.0.0 :
-
   Version bump to gtk2 version (slotified).
 
 *gkrellm-1.2.13 (02 Jul 2002)
 
   15 Jul 2002; Owen Stampflee <owen@gentoo.org> :
-
   Added PPC to KEYWORDS.
 
   02 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-1.2.13.ebuild
   files/digest-gkrellm-1.2.13 :
-
   Version bump thanks to Rachel Holmes.
 
 *gkrellm-1.2.12 (23 Jun 2002)
 
   23 Jun 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-1.2.12.ebuild :
-
   Version bump thanks to Rachel Holmes.
 
 *gkrellm-1.2.11 (28 Mar 2002)
 
 	28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-1.2.11.ebuild:
-
 	Version bump, with new features and bug fixes.
 
 *gkrellm-1.2.10 (21 Mar 2002)
 
 	21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-1.2.10.ebuild:
-
 	HTML documentation will not be gzipped now.
 
 *gkrellm-1.2.10 (19 Mar 2002)
 
 	19 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gkrellm-1.2.10.ebuild:
-
 	Updated to new version of gkrellm.  Copied over old one and made it
 	fetch a tar.bz2 instead of a tar.gz
 
 *gkrellm-1.2.9 (19 Feb 2002)
 
 	19 Feb 2002; Aron Griffis <agriffis@gentoo.org> gkrellm-1.2.9.ebuild:
-
 	Updated to new version of gkrellm.  Fixed up the dependencies to include
 	gettext.  Thanks to Seemant Kulleen for the ebuild.
 
 *gkrellm-1.2.5 (1 Feb 2002)
 
 	6 Mar 2002; T.Neidt <tod@gentoo.org> ChangeLog, gkrellm-1.2.5.ebuild:
-
 	Removed. Tarball no longer available from SRC_URI.
 	Bug# 862, thanks Jochem Prins.
 	
 	1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-	
 	Added initial ChangeLog which should be updated whenever the package is
 	updated in any way. This changelog is targetted to users. This means that
 	the comments should well explained and written in clean English. The
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 5a88a7d2a85c..9bc97ebed185 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,12 +1,15 @@
-MD5 22a90da8bd973e9a56acda3b6ccb1d3d ChangeLog 8842
+MD5 2e40b276cd86dd88a17a74f7fa549c61 ChangeLog 8982
 MD5 ba737436adbc080cfc32870c2cb440e3 gkrellm-1.2.13.ebuild 916
 MD5 0cbfbeeb375623e66000ec9d511e8b1a gkrellm-2.1.10.ebuild 1571
-MD5 0f5aa783d9ac45e2fc8e370ec86f8960 gkrellm-2.1.16.ebuild 1665
+MD5 1e1ccff84ea51ae1a9eb2c5820e9ab40 metadata.xml 152
 MD5 761ca5c0b48261bd884d14378fb3b965 gkrellm-2.1.20.ebuild 1667
 MD5 0dffc7030c973aba1d8950aa8772c9b1 gkrellm-2.1.21.ebuild 1664
-MD5 cafab2b9743941916312f01b8f64cffd files/gkrellmd 598
+MD5 0f5aa783d9ac45e2fc8e370ec86f8960 gkrellm-2.1.16.ebuild 1665
+MD5 c7dcb8442cab2dd0d8e7da28ff960ae4 gkrellm-2.1.22.ebuild 1668
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
 MD5 7080ee73719d75a573216e6661b04032 files/digest-gkrellm-2.1.10 67
-MD5 2bc2bbd63d2c61b7db072bc1ae0aea75 files/digest-gkrellm-2.1.16 67
 MD5 79872955cccce1dc999d1d4f78726aea files/digest-gkrellm-2.1.20 67
 MD5 c5d8fc720276fdf771751c4e12521c6d files/digest-gkrellm-2.1.21 67
+MD5 2ce5d3981d93668e61a79b5080cb9433 files/digest-gkrellm-2.1.22 67
+MD5 cafab2b9743941916312f01b8f64cffd files/gkrellmd 598
+MD5 2bc2bbd63d2c61b7db072bc1ae0aea75 files/digest-gkrellm-2.1.16 67
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.22 b/app-admin/gkrellm/files/digest-gkrellm-2.1.22
new file mode 100644
index 000000000000..f5a4430222ad
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.1.22
@@ -0,0 +1 @@
+MD5 036823ec64a2c496d46adc5e3f019337 gkrellm-2.1.22.tar.bz2 624434
diff --git a/app-admin/gkrellm/gkrellm-2.1.22.ebuild b/app-admin/gkrellm/gkrellm-2.1.22.ebuild
new file mode 100644
index 000000000000..a6cc5cb3a387
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.1.22.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 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.22.ebuild,v 1.1 2003/12/14 14:37:10 mholzer Exp $
+
+IUSE="gtk gtk2 nls"
+
+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 ~mips"
+
+DEPEND=">=sys-apps/sed-4
+	gtk? (  >=x11-libs/gtk+-2.0.5 )
+	gtk2? ( >=x11-libs/gtk+-2.0.5 )"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_compile() {
+	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 gtk2 || use gtk
+	then
+		PREFIX=/usr emake || die
+	else
+		cd ${S}/server
+		emake glib12=1 || die
+	fi
+}
+
+src_install() {
+	dodir /usr/{bin,include,share/man}
+
+	if use gtk2 || use gtk
+	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
+}
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
new file mode 100644
index 000000000000..71adafdb6ac1
--- /dev/null
+++ b/app-admin/gkrellm/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>mholzer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>