Version bumped.

3 files changed, 82 insertions, 5 deletions

diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index f639d560c5d6..ea8b84058901 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,9 +1,9 @@
-MD5 2cacd5c6abd0ec905774ba8d8bb0b03b ChangeLog 7940
+MD5 5a418e3b7684b9376124e990fa3ab518 ChangeLog 8063
 MD5 09e02ffeb4992e1da5ee1889f9251ba5 gkrellm-1.2.13.ebuild 916
 MD5 b6a59d45c1bbe01ef124c20b07b309ed gkrellm-2.1.10.ebuild 1573
-MD5 d42eb291a7f6912223e9847b5f53c376 gkrellm-2.1.17.ebuild 1666
+MD5 4039a976fd592b3a21433b5c7e485288 gkrellm-2.1.17.ebuild 1666
+MD5 e51c75e9237b7511d056d95aec0d17e4 gkrellm-2.1.16.ebuild 1665
 MD5 ca95e6d1ab180df8642e5a17eb575f68 gkrellm-2.1.15.ebuild 1652
-MD5 d42eb291a7f6912223e9847b5f53c376 gkrellm-2.1.16.ebuild 1666
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
 MD5 7080ee73719d75a573216e6661b04032 files/digest-gkrellm-2.1.10 67
 MD5 66166ff62f32346abe83ebe847d0ebbb files/digest-gkrellm-2.1.17 67
diff --git a/app-admin/gkrellm/gkrellm-2.1.16.ebuild b/app-admin/gkrellm/gkrellm-2.1.16.ebuild
index 4cd88b202422..44f659f54171 100644
--- a/app-admin/gkrellm/gkrellm-2.1.16.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.16.ebuild
@@ -1,6 +1,6 @@
 # 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.16.ebuild,v 1.3 2003/09/07 22:25:24 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.16.ebuild,v 1.4 2003/09/12 17:00:35 mholzer Exp $
 
 IUSE="gtk gtk2 nls"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~mips"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~mips"
 
 DEPEND=">=sys-apps/sed-4
 	gtk? (  >=x11-libs/gtk+-2.0.5 )
diff --git a/app-admin/gkrellm/gkrellm-2.1.17.ebuild b/app-admin/gkrellm/gkrellm-2.1.17.ebuild
new file mode 100644
index 000000000000..313b68191890
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.1.17.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.17.ebuild,v 1.1 2003/09/12 17:00:35 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/${PN}/${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
+}