fixing depend. see 45343

6 files changed, 30 insertions, 25 deletions

diff --git a/gnome-extra/glibwww/ChangeLog b/gnome-extra/glibwww/ChangeLog
index f2ef2c40052d..2bcb92de79db 100644
--- a/gnome-extra/glibwww/ChangeLog
+++ b/gnome-extra/glibwww/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/glibwww
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/glibwww/ChangeLog,v 1.5 2003/02/12 06:52:54 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/glibwww/ChangeLog,v 1.6 2004/03/24 23:15:29 mholzer Exp $
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> glibwww-0.2-r2.ebuild:
+  fixing depend. see 45343
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/gnome-extra/glibwww/glibwww-0.2-r2.ebuild b/gnome-extra/glibwww/glibwww-0.2-r2.ebuild
index 3ce80adb3a44..48858ca73ca7 100644
--- a/gnome-extra/glibwww/glibwww-0.2-r2.ebuild
+++ b/gnome-extra/glibwww/glibwww-0.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/glibwww/glibwww-0.2-r2.ebuild,v 1.9 2004/02/22 20:49:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/glibwww/glibwww-0.2-r2.ebuild,v 1.10 2004/03/24 23:15:29 mholzer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The Gnome WWW Libraries"
@@ -10,25 +10,23 @@ SLOT="0"
 KEYWORDS="x86 sparc"
 LICENSE="GPL-2"
 
-RDEPEND=">=net-libs/libwww-1.5.3-r1
+DEPEND=">=net-libs/libwww-1.5.3-r1
 	 >=gnome-base/gnome-libs-1.4.1.2-r1"
 
-DEPEND="${RDEPEND}"
-
 src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
+	./configure --host=${CHOST} \
+		    --prefix=/usr	\
+		    --sysconfdir=/etc	\
+		    --localstatedir=/var/lib \
 	assert
 
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
+	make prefix=${D}/usr \
+	     sysconfdir=${D}/etc \
+	     localstatedir=${D}/var/lib	\
 	     install || die
 
 	dodoc AUTHORS ChangeLog NEWS README
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index c5987f0a9f8e..113f8c77d60c 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.39 2004/03/19 08:49:00 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.40 2004/03/24 23:16:44 mholzer Exp $
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> gtkhtml-1.1.10.ebuild:
+  fixing depend. see 45343
 
 *gtkhtml-1.1.10-r1 (06 Feb 2004)
 
diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild
index 984fc3fefdcf..96969340fee5 100644
--- a/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild,v 1.9 2004/01/20 13:06:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild,v 1.10 2004/03/24 23:16:44 mholzer Exp $
 
 IUSE="nls gnome"
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa"
 
 # peg gtkhtml at gal-0.23 because it might get confused with gal-1.99
-RDEPEND="=gnome-extra/gal-0.24*
+DEPEND="=gnome-extra/gal-0.24*
 	<gnome-base/control-center-1.99.0
 	>=gnome-base/libghttp-1.0.9-r1
 	>=dev-libs/libunicode-0.4-r1
@@ -32,8 +32,6 @@ RDEPEND="=gnome-extra/gal-0.24*
 #	gnome? ( <gnome-base/gconf-1.1.0 )
 # Borks without gconf in most cases
 
-DEPEND="${RDEPEND}"
-
 src_compile() {
 	elibtoolize
 
diff --git a/gnome-extra/merlin-cpufire/ChangeLog b/gnome-extra/merlin-cpufire/ChangeLog
index ec03cffc5fbd..dc18ac610ba2 100644
--- a/gnome-extra/merlin-cpufire/ChangeLog
+++ b/gnome-extra/merlin-cpufire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/merlin-cpufire
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/merlin-cpufire/ChangeLog,v 1.5 2003/02/12 06:55:31 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/merlin-cpufire/ChangeLog,v 1.6 2004/03/24 23:17:36 mholzer Exp $
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org>
+  merlin-cpufire-0.1.0-r1.ebuild:
+  fixing depend. see 45343
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild b/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild
index caa38dea5414..86ae01b578bb 100644
--- a/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild
+++ b/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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-r1.ebuild,v 1.5 2004/02/22 20:53:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/merlin-cpufire/merlin-cpufire-0.1.0-r1.ebuild,v 1.6 2004/03/24 23:17:36 mholzer Exp $
 
 DESCRIPTION="Gnome applet that displays CPU usage as burning fire"
 HOMEPAGE="http://nitric.com/freeware"
@@ -9,9 +9,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc"
 
-RDEPEND="gnome-base/gnome-core
+DEPEND="gnome-base/gnome-core
 	<gnome-base/libgtop-2"
-DEPEND="${RDEPEND}"
 
 src_compile() {
 	mv Makefile Makefile~