bugfix release

6 files changed, 11 insertions, 74 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index b1c29b090097..30840ba36a5e 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,7 +1,15 @@
 # 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.26 2002/12/23 19:19:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.27 2003/01/17 21:47:26 seemant Exp $
 
+*gkrellm-2.1.5 (17 Jan 2003)
+
+  17 Jan 2003; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.5.ebuild
+  files/digest-gkrellm-2.1.5 :
+
+  Version bump which fixes bugs in 2.1.4, specifically with multiple instances
+  starting up due to gnome session management.  Thanks to: koto@mynetix.de
+  (Andreas Kotowicz) in bug #13977
 
 *gkrellm-2.1.4 (23 Dec 2002)
 
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.3 b/app-admin/gkrellm/files/digest-gkrellm-2.1.3
deleted file mode 100644
index 953783b969d4..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e89ae44afd3686deadbc6b3ac6dfecbd gkrellm-2.1.3.tar.bz2 545523
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.4 b/app-admin/gkrellm/files/digest-gkrellm-2.1.4
deleted file mode 100644
index 87a4481c04da..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3130e8d6487642c2eb3e68b8d2ee8b0 gkrellm-2.1.4.tar.bz2 546665
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.5 b/app-admin/gkrellm/files/digest-gkrellm-2.1.5
new file mode 100644
index 000000000000..5fd932c65476
--- /dev/null
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.1.5
@@ -0,0 +1 @@
+MD5 95dfe8ef1bf4f0eb20a44d60aa9ff2ad gkrellm-2.1.5.tar.bz2 566570
diff --git a/app-admin/gkrellm/gkrellm-2.1.3.ebuild b/app-admin/gkrellm/gkrellm-2.1.3.ebuild
deleted file mode 100644
index 1b662491d2c5..000000000000
--- a/app-admin/gkrellm/gkrellm-2.1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.3.ebuild,v 1.1 2002/12/14 21:53:05 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="gtk 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 || use gtk
-	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 || use gtk
-	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
-}
diff --git a/app-admin/gkrellm/gkrellm-2.1.4.ebuild b/app-admin/gkrellm/gkrellm-2.1.5.ebuild
index 65cf62a28182..f2b54f580db7 100644
--- a/app-admin/gkrellm/gkrellm-2.1.4.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.5.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.4.ebuild,v 1.3 2003/01/08 11:30:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.5.ebuild,v 1.1 2003/01/17 21:47:27 seemant Exp $
 
 DESCRIPTION="Single process stack of various system monitors"
 SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"