Version bumped. Closes 52955.

4 files changed, 102 insertions, 13 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 6f5cb060be54..e97a8a771f4e 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.89 2004/06/02 02:26:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.90 2004/06/15 16:49:20 mholzer Exp $
+
+*gkrellm-2.2.1 (15 Jun 2004)
+
+  15 Jun 2004; Martin Holzer <mholzer@gentoo.org> gkrellm-2.2.1.ebuild:
+  Version bumped. Closes 52955.
 
   01 Jun 2004; Aron Griffis <agriffis@gentoo.org> gkrellm-1.2.13.ebuild,
   gkrellm-2.1.25.ebuild, gkrellm-2.1.28-r1.ebuild, gkrellm-2.1.28.ebuild,
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 18ee4fe8a182..55e226d66dcb 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,16 +1,18 @@
-MD5 9481feca0054329672d141365164051c gkrellm-2.1.28-r1.ebuild 1755
-MD5 1a2d48a050c1ec43812b2b00cecc3f91 gkrellm-1.2.13.ebuild 919
-MD5 64656f6059943968cb60c9585674c663 gkrellm-2.1.28.ebuild 1696
-MD5 b0bb7c3048fbb63197b17b57114471f1 ChangeLog 13024
+MD5 31562879ab3ec9d9f0b8e21030d2caa8 ChangeLog 13025
+MD5 4f36a50693ef996da7d0fb477711d759 gkrellm-1.2.13.ebuild 920
+MD5 b6e2df7e8b56d152a7ca08411b650e00 gkrellm-2.2.0.ebuild 1739
+MD5 b6e2df7e8b56d152a7ca08411b650e00 gkrellm-2.2.1.ebuild 1739
+MD5 c8a7006e26def52f7052943747e71c86 gkrellm-2.1.25.ebuild 1782
 MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
-MD5 0ef9c72ff082ff8eb515b20807dc28ec gkrellm-2.2.0.ebuild 1738
-MD5 966b7fc5456517fa8805369018c8be8b gkrellm-2.1.25.ebuild 1781
-MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
-MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
-MD5 d9df3e6d6e0a42c64897394c077f894c files/gkrellmd 599
+MD5 b7504edbc132ea0e6e864799970b54e7 gkrellm-2.1.28-r1.ebuild 1756
+MD5 ba8dea0d38dd37daf2fafafcacabcd35 gkrellm-2.1.28.ebuild 1697
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
 MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67
-MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28 67
-MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448
-MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
 MD5 01a75ae88987b6571ae89ccb1c345c34 files/digest-gkrellm-2.2.0 66
+MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
+MD5 d9df3e6d6e0a42c64897394c077f894c files/gkrellmd 599
+MD5 8d4dc6be2fff39714894285e0791852b files/digest-gkrellm-2.2.1 66
+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
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.1 b/app-admin/gkrellm/files/digest-gkrellm-2.2.1
new file mode 100644
index 000000000000..e2f90c52bbb8
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.1
@@ -0,0 +1 @@
+MD5 56b96f14881c30753f3eb1251ef71068 gkrellm-2.2.1.tar.bz2 663952
diff --git a/app-admin/gkrellm/gkrellm-2.2.1.ebuild b/app-admin/gkrellm/gkrellm-2.2.1.ebuild
new file mode 100644
index 000000000000..2c47072934c9
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.2.1.ebuild
@@ -0,0 +1,81 @@
+# 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.1.ebuild,v 1.1 2004/06/15 16:49:20 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
+		>=x11-libs/pango-1.4.0 )"
+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
+}