corrected dependencies

3 files changed, 17 insertions, 11 deletions

diff --git a/gnome-extra/merlin-cpufire/ChangeLog b/gnome-extra/merlin-cpufire/ChangeLog
index 04d12fb74da5..a6a86d61e6ee 100644
--- a/gnome-extra/merlin-cpufire/ChangeLog
+++ b/gnome-extra/merlin-cpufire/ChangeLog
@@ -1,13 +1,15 @@
 # ChangeLog for gnome-extra/merlin-cpufire
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/merlin-cpufire/ChangeLog,v 1.1 2002/06/19 01:08:02 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/merlin-cpufire/ChangeLog,v 1.2 2002/07/24 00:48:34 blizzy Exp $
+
+*merlin-cpufire-0.1.0-r1 (24 Jul 2002)
+
+  24 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+
+  merlin-cpufire needs libgtop <2.x; changed ebuild to reflect that.
 
 *merlin-cpufire-0.1.0 (18 Jun 2002)
 
-  18 Jun 2002; Ryan Phillips <rphillips@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 details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  18 Jun 2002; Ryan Phillips <rphillips@gentoo.org> :
+
+  Initial import.
diff --git a/gnome-extra/merlin-cpufire/files/digest-merlin-cpufire-0.1.0 b/gnome-extra/merlin-cpufire/files/digest-merlin-cpufire-0.1.0-r1
index 10c03864695c..10c03864695c 100644
--- a/gnome-extra/merlin-cpufire/files/digest-merlin-cpufire-0.1.0
+++ b/gnome-extra/merlin-cpufire/files/digest-merlin-cpufire-0.1.0-r1
diff --git a/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0.ebuild b/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild
index d59eb55e3310..79680dba5405 100644
--- a/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0.ebuild
+++ b/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild
@@ -1,13 +1,17 @@
 # Copyright 2002 Maik Schreiber
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0.ebuild,v 1.1 2002/06/19 01:08:02 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild,v 1.1 2002/07/24 00:48:34 blizzy Exp $
 
 DESCRIPTION="Gnome applet that displays CPU usage as burning fire"
 HOMEPAGE="http://nitric.com/freeware"
+SRC_URI="ftp://ftp.ibiblio.org/pub/packages/desktops/gnome/sources/merlin-cpufire/${P}.tgz"
 LICENSE="GPL-2"
-RDEPEND="gnome-base/gnome-core gnome-base/libgtop"
+SLOT="0"
+KEYWORDS="x86"
+
+RDEPEND="gnome-base/gnome-core
+	<gnome-base/libgtop-2"
 DEPEND="${RDEPEND}"
-SRC_URI="ftp://ftp.ibiblio.org/pub/packages/desktops/gnome/sources/merlin-cpufire/${P}.tgz"
 
 src_compile() {
 	mv Makefile Makefile~