mozilla moved from net-www to www-client

(Portage version: 1.585-cvs)

83 files changed, 263 insertions, 177 deletions

diff --git a/dev-dotnet/gecko-sharp/ChangeLog b/dev-dotnet/gecko-sharp/ChangeLog
index 45e90d9d44f5..dbb3b3d08058 100644
--- a/dev-dotnet/gecko-sharp/ChangeLog
+++ b/dev-dotnet/gecko-sharp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/gecko-sharp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/ChangeLog,v 1.24 2005/03/21 19:59:15 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/ChangeLog,v 1.25 2005/03/23 16:15:58 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  gecko-sharp-0.5-r2.ebuild, gecko-sharp-0.6.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   21 Mar 2005; David Holm <dholm@gentoo.org> gecko-sharp-0.6.ebuild:
   Stable on ppc.
diff --git a/dev-dotnet/gecko-sharp/gecko-sharp-0.5-r2.ebuild b/dev-dotnet/gecko-sharp/gecko-sharp-0.5-r2.ebuild
index ddc6bf93aca7..e9066b5e4f8f 100644
--- a/dev-dotnet/gecko-sharp/gecko-sharp-0.5-r2.ebuild
+++ b/dev-dotnet/gecko-sharp/gecko-sharp-0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.5-r2.ebuild,v 1.5 2005/03/15 00:21:31 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.5-r2.ebuild,v 1.6 2005/03/23 16:15:58 seemant Exp $
 
 inherit mono
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND=">=dev-lang/mono-1.0
 	=dev-dotnet/gtk-sharp-1.0*
-	net-www/mozilla"
+	www-client/mozilla"
 
 src_compile() {
 	econf || die "./configure failed!"
diff --git a/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild b/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild
index f9cc6890a5d6..9b54d54ab14f 100644
--- a/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild
+++ b/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild,v 1.9 2005/03/21 19:59:15 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild,v 1.10 2005/03/23 16:15:58 seemant Exp $
 
 inherit mono
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND=">=dev-lang/mono-1.0
 	=dev-dotnet/gtk-sharp-1.0*
-	net-www/mozilla"
+	www-client/mozilla"
 
 src_compile() {
 	econf || die "./configure failed!"
diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index b79ec145701d..0aa7a83be9d0 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.9 2005/01/26 17:31:00 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.10 2005/03/23 16:15:53 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gtk2hs-0.9.7.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
 *gtk2hs-0.9.7 (26 Jan 2005)
 
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
index e46a5f11f9b5..1df451dac65d 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild,v 1.1 2005/01/26 17:31:00 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild,v 1.2 2005/03/23 16:15:53 seemant Exp $
 
 inherit base check-reqs ghc-package
 
@@ -19,7 +19,7 @@ DEPEND=">=virtual/ghc-5.04
 		gnome? ( >=gnome-base/libglade-2
 				 >=x11-libs/gtksourceview-0.6
 				 >=gnome-base/gconf-2 )
-		mozilla? ( >=net-www/mozilla-1.4 )
+		mozilla? ( >=www-client/mozilla-1.4 )
 		doc? ( >=dev-haskell/haddock-0.6 )"
 
 pkg_setup() {
diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 7527e34a8595..d819e9b887cc 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/devhelp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.28 2004/12/15 12:50:07 gustavoz Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.29 2005/03/23 16:16:24 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> devhelp-0.9.2.ebuild,
+  devhelp-0.9.3.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   15 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> devhelp-0.9.3.ebuild:
   Stable on sparc
diff --git a/dev-util/devhelp/devhelp-0.9.2.ebuild b/dev-util/devhelp/devhelp-0.9.2.ebuild
index ccd7af2ac15a..6fbb8d8ed6ec 100644
--- a/dev-util/devhelp/devhelp-0.9.2.ebuild
+++ b/dev-util/devhelp/devhelp-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.9.2.ebuild,v 1.3 2004/11/23 15:32:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.9.2.ebuild,v 1.4 2005/03/23 16:16:24 seemant Exp $
 
 inherit gnome2
 
@@ -16,7 +16,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4
 	>=gnome-base/libgnomeui-2.2
 	>=gnome-base/gnome-vfs-2.2
-	net-www/mozilla
+	www-client/mozilla
 	zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
diff --git a/dev-util/devhelp/devhelp-0.9.3.ebuild b/dev-util/devhelp/devhelp-0.9.3.ebuild
index e2d4d7d8624a..0d9b67dd7841 100644
--- a/dev-util/devhelp/devhelp-0.9.3.ebuild
+++ b/dev-util/devhelp/devhelp-0.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.9.3.ebuild,v 1.3 2004/12/15 12:50:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.9.3.ebuild,v 1.4 2005/03/23 16:16:25 seemant Exp $
 
 inherit gnome2 eutils
 
@@ -16,7 +16,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	>=gnome-base/libgnomeui-2.2
 	>=gnome-base/gnome-vfs-2.2
 	>=gnome-base/libglade-2
-	net-www/mozilla
+	www-client/mozilla
 	zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 98d2f99645e9..265768cc57ec 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.83 2005/03/03 11:44:46 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.84 2005/03/23 16:16:48 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  eclipse-sdk-2.1.3-r5.ebuild, eclipse-sdk-3.0.0-r3.ebuild,
+  eclipse-sdk-3.0.1.ebuild, eclipse-sdk-3.0.1-r1.ebuild,
+  eclipse-sdk-3.0.1-r2.ebuild, eclipse-sdk-3.1_pre1.ebuild,
+  eclipse-sdk-3.1_pre2.ebuild, eclipse-sdk-3.1_pre3.ebuild,
+  eclipse-sdk-3.1_pre4.ebuild, eclipse-sdk-3.1_pre5.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   03 Mar 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
   eclipse-sdk-3.1_pre5.ebuild:
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild
index f85e47da6731..ecdfd257f6cc 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild,v 1.10 2005/02/03 11:09:50 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild,v 1.11 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ RDEPEND=">=virtual/jdk-1.3
 		      )
 	      )
 	gnome? ( =gnome-base/gnome-vfs-2* )
-	mozilla? ( net-www/mozilla )
+	mozilla? ( www-client/mozilla )
 	jikes? ( >=dev-java/jikes-1.19 )
 	"
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
index d3fd2b0964b0..ec7041ee46d1 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild,v 1.11 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild,v 1.12 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	jikes? ( >=dev-java/jikes-1.19 )
 	!media-fonts/unifont"
@@ -61,7 +61,7 @@ pkg_setup() {
 
 	if ${use_gtk} && use mozilla ; then
 		if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-			einfo "Compiling against net-www/mozilla"
+			einfo "Compiling against www-client/mozilla"
 			mozilla_dir=/usr/lib/mozilla
 		elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 			einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild
index e20c7cac0d1b..82f5c4ebc48d 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild,v 1.5 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild,v 1.6 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	!media-fonts/unifont"
 
@@ -178,7 +178,7 @@ src_install() {
 function detect-mozilla()
 {
 	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against net-www/mozilla"
+		einfo "Compiling against www-client/mozilla"
 		mozilla_dir=/usr/lib/mozilla
 	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 		einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild
index 6393a5f0e347..dec611ccd90a 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild,v 1.6 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild,v 1.7 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	!media-fonts/unifont"
 
@@ -182,7 +182,7 @@ src_install() {
 function detect-mozilla()
 {
 	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against net-www/mozilla"
+		einfo "Compiling against www-client/mozilla"
 		mozilla_dir=/usr/lib/mozilla
 	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 		einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild
index a341c430d9b4..6d9713e1b8be 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild,v 1.3 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild,v 1.4 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	!media-fonts/unifont"
 
@@ -60,7 +60,7 @@ pkg_setup() {
 
 	if ${use_gtk} && use mozilla ; then
 		if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-			einfo "Compiling against net-www/mozilla"
+			einfo "Compiling against www-client/mozilla"
 			mozilla_dir=/usr/lib/mozilla
 		elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 			einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild
index 658415d1de58..9a62b5f3e434 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild,v 1.4 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild,v 1.5 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	jikes? ( >=dev-java/jikes-1.19 )
 	!media-fonts/unifont"
@@ -54,7 +54,7 @@ pkg_setup() {
 
 	if ${use_gtk} && use mozilla ; then
 		if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-			einfo "Compiling against net-www/mozilla"
+			einfo "Compiling against www-client/mozilla"
 			mozilla_dir=/usr/lib/mozilla
 		elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 			einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild
index de3e9dff884a..58405c94e8ad 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild,v 1.3 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild,v 1.4 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	!media-fonts/unifont"
 
@@ -188,7 +188,7 @@ function detect-mozilla()
 	mozilla_dir="--mozdir-unset---"
 
 	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against net-www/mozilla"
+		einfo "Compiling against www-client/mozilla"
 		mozilla_dir=/usr/lib/mozilla
 	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 		einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild
index 34ef2a793fc4..c9f8a708b257 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild,v 1.3 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild,v 1.4 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	!media-fonts/unifont"
 
@@ -188,7 +188,7 @@ function detect-mozilla()
 	mozilla_dir="--mozdir-unset---"
 
 	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against net-www/mozilla"
+		einfo "Compiling against www-client/mozilla"
 		mozilla_dir=/usr/lib/mozilla
 	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 		einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild
index 47ce6545e73c..a60dab87de1b 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild,v 1.6 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild,v 1.7 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.7* )
+	mozilla? ( >=www-client/mozilla-1.7* )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	!media-fonts/unifont"
 
@@ -191,7 +191,7 @@ function detect-mozilla()
 	mozilla_dir="--mozdir-unset---"
 
 	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against net-www/mozilla"
+		einfo "Compiling against www-client/mozilla"
 		mozilla_dir=/usr/lib/mozilla
 #	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 #		einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre5.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre5.ebuild
index 56b65394a3ec..e6e81f0ad5a8 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre5.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre5.ebuild,v 1.3 2005/03/18 20:13:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre5.ebuild,v 1.4 2005/03/23 16:16:48 seemant Exp $
 
 inherit eutils java-utils
 
@@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 			!motif? ( >=x11-libs/gtk+-2.2.4 )
 		      )
 	      )
-	mozilla? ( >=net-www/mozilla-1.7* )
+	mozilla? ( >=www-client/mozilla-1.7* )
 	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 	!media-fonts/unifont"
 
@@ -191,7 +191,7 @@ function detect-mozilla()
 	mozilla_dir="--mozdir-unset---"
 
 	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against net-www/mozilla"
+		einfo "Compiling against www-client/mozilla"
 		mozilla_dir=/usr/lib/mozilla
 #	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
 #		einfo "Compiling against www-client/mozilla-firefox"
diff --git a/dev-util/sashxb/ChangeLog b/dev-util/sashxb/ChangeLog
index 891a0458da42..7c301ec3b8e4 100644
--- a/dev-util/sashxb/ChangeLog
+++ b/dev-util/sashxb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/sashxb
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sashxb/ChangeLog,v 1.6 2004/06/25 02:45:56 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sashxb/ChangeLog,v 1.7 2005/03/23 16:16:47 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> sashxb-1.0.2.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/dev-util/sashxb/sashxb-1.0.2.ebuild b/dev-util/sashxb/sashxb-1.0.2.ebuild
index cb651407a758..add1077c157b 100644
--- a/dev-util/sashxb/sashxb-1.0.2.ebuild
+++ b/dev-util/sashxb/sashxb-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sashxb/sashxb-1.0.2.ebuild,v 1.10 2004/08/21 16:19:57 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sashxb/sashxb-1.0.2.ebuild,v 1.11 2005/03/23 16:16:47 seemant Exp $
 
 DESCRIPTION="Application environment for HTML and JS developers."
 HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/sashxb/"
@@ -11,7 +11,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="x86 sparc "
 IUSE=""
 
-RDEPEND=">=net-www/mozilla-1.0
+RDEPEND=">=www-client/mozilla-1.0
 	>=dev-libs/gdome2-0.7
 	dev-libs/libxml2
 	gnome-base/libglade
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 757f781c7e08..799709066b3d 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.30 2005/03/21 12:49:45 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.31 2005/03/23 16:17:12 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  evolution-data-server-1.2.0-r1.ebuild, evolution-data-server-1.2.1.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
 *evolution-data-server-1.2.1 (21 Mar 2005)
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild
index bcf5ac4193cb..07dfdac151d5 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild,v 1.1 2005/03/19 10:19:58 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.0-r1.ebuild,v 1.2 2005/03/23 16:17:12 seemant Exp $
 
 inherit eutils gnome2
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.2.2
 	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? ( mozilla? ( net-www/mozilla )
+	ssl? ( mozilla? ( www-client/mozilla )
 		  !mozilla? ( >=dev-libs/nspr-4.4
 					  >=dev-libs/nss-3.9 )
 		   )
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.2.1.ebuild
index d8daa259fdb1..413d5bf2a8a0 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.2.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.1.ebuild,v 1.1 2005/03/21 12:49:45 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.1.ebuild,v 1.2 2005/03/23 16:17:12 seemant Exp $
 
 inherit eutils gnome2
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.2.2
 	ldap? ( >=net-nds/openldap-2.0 )
-	ssl? ( mozilla? ( net-www/mozilla )
+	ssl? ( mozilla? ( www-client/mozilla )
 		  !mozilla? ( >=dev-libs/nspr-4.4
 					  >=dev-libs/nss-3.9 )
 		   )
diff --git a/kde-base/xparts/ChangeLog b/kde-base/xparts/ChangeLog
index 58fd9e9bca9c..e1fc5897a7c4 100644
--- a/kde-base/xparts/ChangeLog
+++ b/kde-base/xparts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/xparts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/ChangeLog,v 1.7 2005/03/18 17:50:31 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/ChangeLog,v 1.8 2005/03/23 16:17:14 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> xparts-3.3.1.ebuild,
+  xparts-3.4.0.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   18 Mar 2005; Daniel Goller <morfic@gentoo.org> xparts-3.4.0.ebuild:
   Added to ~ppc
diff --git a/kde-base/xparts/xparts-3.3.1.ebuild b/kde-base/xparts/xparts-3.3.1.ebuild
index cb5b4ec05b5a..f76dece19c26 100644
--- a/kde-base/xparts/xparts-3.3.1.ebuild
+++ b/kde-base/xparts/xparts-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.3.1.ebuild,v 1.6 2005/02/05 11:39:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.3.1.ebuild,v 1.7 2005/03/23 16:17:14 seemant Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="dcopc"
@@ -15,7 +15,7 @@ KEYWORDS="~x86"
 IUSE="mozilla"
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
-	mozilla? ( net-www/mozilla )"
+	mozilla? ( www-client/mozilla )"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
 pkg_setup() {
diff --git a/kde-base/xparts/xparts-3.4.0.ebuild b/kde-base/xparts/xparts-3.4.0.ebuild
index cffb0f134b20..b282c2ee3499 100644
--- a/kde-base/xparts/xparts-3.4.0.ebuild
+++ b/kde-base/xparts/xparts-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.4.0.ebuild,v 1.2 2005/03/18 17:50:31 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.4.0.ebuild,v 1.3 2005/03/23 16:17:14 seemant Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="dcopc"
@@ -15,7 +15,7 @@ KEYWORDS="~x86 ~ppc" # broken according to upstream - 3.4a1 README
 IUSE="mozilla"
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
-	mozilla? ( net-www/mozilla )"
+	mozilla? ( www-client/mozilla )"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
 src_unpack() {
diff --git a/media-gfx/grace/ChangeLog b/media-gfx/grace/ChangeLog
index a5166759bc60..d5efe054d7ef 100644
--- a/media-gfx/grace/ChangeLog
+++ b/media-gfx/grace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/grace
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.28 2005/03/23 15:13:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/ChangeLog,v 1.29 2005/03/23 16:17:44 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> grace-5.1.10-r1.ebuild,
+  grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.14.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> grace-5.1.10-r1.ebuild,
   grace-5.1.12-r1.ebuild, grace-5.1.13.ebuild, grace-5.1.14.ebuild:
diff --git a/media-gfx/grace/grace-5.1.10-r1.ebuild b/media-gfx/grace/grace-5.1.10-r1.ebuild
index 2c2537e061f2..9581cf77ea44 100644
--- a/media-gfx/grace/grace-5.1.10-r1.ebuild
+++ b/media-gfx/grace/grace-5.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10-r1.ebuild,v 1.11 2005/03/23 15:13:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.10-r1.ebuild,v 1.12 2005/03/23 16:17:44 seemant Exp $
 
 inherit eutils
 
@@ -43,7 +43,7 @@ src_compile() {
 		|| has_version 'net-www/mozilla-firebird-bin' \
 		|| has_version 'net-www/mozilla-firebird-cvs' ; then
 		gracehelpviewer="MozillaFirebird"
-	elif has_version 'net-www/mozilla' ; then
+	elif has_version 'www-client/mozilla' ; then
 		gracehelpviewer="mozilla"
 	elif has_version 'kde-base/kdebase' ; then
 		gracehelpviewer="konqueror"
diff --git a/media-gfx/grace/grace-5.1.12-r1.ebuild b/media-gfx/grace/grace-5.1.12-r1.ebuild
index ab8c8bd48bbd..79bd157f122e 100644
--- a/media-gfx/grace/grace-5.1.12-r1.ebuild
+++ b/media-gfx/grace/grace-5.1.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.12-r1.ebuild,v 1.16 2005/03/23 15:13:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.12-r1.ebuild,v 1.17 2005/03/23 16:17:44 seemant Exp $
 
 inherit eutils
 
@@ -48,7 +48,7 @@ src_compile() {
 		|| has_version 'net-www/mozilla-firebird-bin' \
 		|| has_version 'net-www/mozilla-firebird-cvs' ; then
 		gracehelpviewer="MozillaFirebird"
-	elif has_version 'net-www/mozilla' ; then
+	elif has_version 'www-client/mozilla' ; then
 		gracehelpviewer="mozilla"
 	elif has_version 'kde-base/kdebase' ; then
 		gracehelpviewer="konqueror"
diff --git a/media-gfx/grace/grace-5.1.13.ebuild b/media-gfx/grace/grace-5.1.13.ebuild
index 19621d27547d..102e562fc9fc 100644
--- a/media-gfx/grace/grace-5.1.13.ebuild
+++ b/media-gfx/grace/grace-5.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.13.ebuild,v 1.17 2005/03/23 15:13:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.13.ebuild,v 1.18 2005/03/23 16:17:44 seemant Exp $
 
 inherit eutils
 
@@ -45,7 +45,7 @@ src_compile() {
 		|| has_version 'net-www/mozilla-firebird-bin' \
 		|| has_version 'net-www/mozilla-firebird-cvs' ; then
 		gracehelpviewer="MozillaFirebird"
-	elif has_version 'net-www/mozilla' ; then
+	elif has_version 'www-client/mozilla' ; then
 		gracehelpviewer="mozilla"
 	elif has_version 'kde-base/kdebase' ; then
 		gracehelpviewer="konqueror"
diff --git a/media-gfx/grace/grace-5.1.14.ebuild b/media-gfx/grace/grace-5.1.14.ebuild
index 7c197ea16658..ed8c289c94b7 100644
--- a/media-gfx/grace/grace-5.1.14.ebuild
+++ b/media-gfx/grace/grace-5.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.14.ebuild,v 1.12 2005/03/23 15:13:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.14.ebuild,v 1.13 2005/03/23 16:17:44 seemant Exp $
 
 inherit eutils
 
@@ -45,7 +45,7 @@ src_compile() {
 		|| has_version 'net-www/mozilla-firebird-bin' \
 		|| has_version 'net-www/mozilla-firebird-cvs' ; then
 		gracehelpviewer="MozillaFirebird"
-	elif has_version 'net-www/mozilla' ; then
+	elif has_version 'www-client/mozilla' ; then
 		gracehelpviewer="mozilla"
 	elif has_version 'kde-base/kdebase' ; then
 		gracehelpviewer="konqueror"
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 816a1c9fd3d0..c035825ccbd1 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freetype
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.72 2005/03/18 19:47:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.73 2005/03/23 16:18:01 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  freetype-2.1.9-r1.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   18 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   freetype-2.1.9-r1.ebuild:
diff --git a/media-libs/freetype/freetype-2.1.9-r1.ebuild b/media-libs/freetype/freetype-2.1.9-r1.ebuild
index dd8c0ac5990a..7082b53c4ee9 100644
--- a/media-libs/freetype/freetype-2.1.9-r1.ebuild
+++ b/media-libs/freetype/freetype-2.1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.9-r1.ebuild,v 1.14 2005/03/18 19:47:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.9-r1.ebuild,v 1.15 2005/03/23 16:18:01 seemant Exp $
 
 inherit eutils flag-o-matic gnuconfig libtool
 
@@ -24,9 +24,9 @@ IUSE="zlib bindist doc"
 DEPEND="virtual/libc
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
-	!<net-www/mozilla-1.7.3-r3
+	!<www-client/mozilla-1.7.3-r3
 	!<www-client/mozilla-firefox-1.0-r3
-	!<net-www/mozilla-thunderbird-0.9-r3
+	!<mail-client/mozilla-thunderbird-0.9-r3
 	!<media-libs/libwmf-0.2.8.2"
 
 src_unpack() {
diff --git a/media-libs/swfdec/ChangeLog b/media-libs/swfdec/ChangeLog
index fd3213eccce9..bb89a8e1bc0a 100644
--- a/media-libs/swfdec/ChangeLog
+++ b/media-libs/swfdec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/swfdec
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/ChangeLog,v 1.12 2004/11/23 21:18:19 sekretarz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/ChangeLog,v 1.13 2005/03/23 16:18:18 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> swfdec-0.2.2.ebuild,
+  swfdec-0.2.2-r1.ebuild, swfdec-0.3.1.ebuild, swfdec-0.3.2.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   23 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> swfdec-0.3.2.ebuild:
   Keyworded ~amd64, bug #71270
diff --git a/media-libs/swfdec/swfdec-0.2.2-r1.ebuild b/media-libs/swfdec/swfdec-0.2.2-r1.ebuild
index bb7745041fad..587ddfab0da6 100644
--- a/media-libs/swfdec/swfdec-0.2.2-r1.ebuild
+++ b/media-libs/swfdec/swfdec-0.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.2.2-r1.ebuild,v 1.9 2004/10/23 20:02:29 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.2.2-r1.ebuild,v 1.10 2005/03/23 16:18:18 seemant Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2
 	sdl? ( media-libs/libsdl )
 	mad? ( media-sound/madplay )
 	>=sys-libs/zlib-1.1.4
-	mozilla? ( >=net-www/mozilla-1.0.0 )"
+	mozilla? ( >=www-client/mozilla-1.0.0 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/media-libs/swfdec/swfdec-0.2.2.ebuild b/media-libs/swfdec/swfdec-0.2.2.ebuild
index 26ec38f742c3..ce56a3b14c13 100644
--- a/media-libs/swfdec/swfdec-0.2.2.ebuild
+++ b/media-libs/swfdec/swfdec-0.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.2.2.ebuild,v 1.7 2004/07/14 20:30:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.2.2.ebuild,v 1.8 2005/03/23 16:18:18 seemant Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ DEPEND=">=x11-libs/gtk+-2.0
 		gnome-base/gnome-libs
 		>=sys-libs/zlib-1.1.4
 		media-sound/madplay
-		mozilla? ( >=net-www/mozilla-1.0.0 )"
+		mozilla? ( >=www-client/mozilla-1.0.0 )"
 #RDEPEND=""
 
 src_unpack() {
diff --git a/media-libs/swfdec/swfdec-0.3.1.ebuild b/media-libs/swfdec/swfdec-0.3.1.ebuild
index 07396acc0120..7e0e7ab2c493 100644
--- a/media-libs/swfdec/swfdec-0.3.1.ebuild
+++ b/media-libs/swfdec/swfdec-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.3.1.ebuild,v 1.3 2004/11/17 14:40:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.3.1.ebuild,v 1.4 2005/03/23 16:18:18 seemant Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2
 	sdl? ( media-libs/libsdl )
 	mad? ( media-sound/madplay )
 	>=sys-libs/zlib-1.1.4
-	mozilla? ( >=net-www/mozilla-1.0.0 )"
+	mozilla? ( >=www-client/mozilla-1.0.0 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/media-libs/swfdec/swfdec-0.3.2.ebuild b/media-libs/swfdec/swfdec-0.3.2.ebuild
index a112d6b10c20..c97100a7f51d 100644
--- a/media-libs/swfdec/swfdec-0.3.2.ebuild
+++ b/media-libs/swfdec/swfdec-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.3.2.ebuild,v 1.2 2004/11/23 21:18:19 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/swfdec/swfdec-0.3.2.ebuild,v 1.3 2005/03/23 16:18:18 seemant Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2
 	sdl? ( media-libs/libsdl )
 	mad? ( media-sound/madplay )
 	>=sys-libs/zlib-1.1.4
-	mozilla? ( >=net-www/mozilla-1.0.0 )"
+	mozilla? ( >=www-client/mozilla-1.0.0 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 2b0c6e35c05e..00fe98697449 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.71 2005/03/09 23:16:54 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.72 2005/03/23 16:18:35 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> vlc-0.6.0-r1.ebuild,
+  vlc-0.6.1.ebuild, vlc-0.6.2.ebuild, vlc-0.6.2-r1.ebuild, vlc-0.7.1.ebuild,
+  vlc-0.7.1-r1.ebuild, vlc-0.7.2.ebuild, vlc-0.7.2-r1.ebuild,
+  vlc-0.8.0.ebuild, vlc-0.8.1.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   10 Mar 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1.ebuild:
   Fixed bug #77611.
diff --git a/media-video/vlc/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild
index 9389404b05de..16dbb55a0c20 100644
--- a/media-video/vlc/vlc-0.6.0-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.16 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.17 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet
@@ -39,7 +39,7 @@ RDEPEND="X? ( virtual/x11 )
 	kde? ( kde-base/kdelibs )
 	lirc? ( app-misc/lirc )
 	mad? ( >=media-sound/madplay-0.14.2b )
-	mozilla? ( >=net-www/mozilla-1.4 )
+	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	oggvorbis? ( >=media-libs/libvorbis-1.0
diff --git a/media-video/vlc/vlc-0.6.1.ebuild b/media-video/vlc/vlc-0.6.1.ebuild
index 78306ca333e7..95af1ba3bc32 100644
--- a/media-video/vlc/vlc-0.6.1.ebuild
+++ b/media-video/vlc/vlc-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.1.ebuild,v 1.14 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.1.ebuild,v 1.15 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -39,7 +39,7 @@ RDEPEND="X? ( virtual/x11 )
 	lirc? ( app-misc/lirc )
 	mad? ( >=media-sound/madplay-0.14.2b )
 	matroska? ( >=media-libs/libmatroska-0.4.4 )
-	mozilla? ( >=net-www/mozilla-1.4 )
+	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild
index 46458f16b1a4..1eac23054324 100644
--- a/media-video/vlc/vlc-0.6.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.17 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.18 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -46,7 +46,7 @@ RDEPEND="X? ( virtual/x11 )
 	lirc? ( app-misc/lirc )
 	mad? ( >=media-sound/madplay-0.14.2b )
 	matroska? ( >=media-libs/libmatroska-0.4.4 )
-	mozilla? ( >=net-www/mozilla-1.4 )
+	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index dfc251a83b91..3bf7a94b836f 100644
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ b/media-video/vlc/vlc-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.22 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.23 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -39,7 +39,7 @@ RDEPEND="X? ( virtual/x11 )
 	lirc? ( app-misc/lirc )
 	mad? ( >=media-sound/madplay-0.14.2b )
 	matroska? ( >=media-libs/libmatroska-0.4.4 )
-	mozilla? ( >=net-www/mozilla-1.4 )
+	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
diff --git a/media-video/vlc/vlc-0.7.1-r1.ebuild b/media-video/vlc/vlc-0.7.1-r1.ebuild
index 50db2de29da6..86e068f5379f 100644
--- a/media-video/vlc/vlc-0.7.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.11 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.12 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -40,7 +40,7 @@ RDEPEND="X? ( virtual/x11 )
 	mad? ( media-libs/libmad
 		media-libs/libid3tag )
 	matroska? ( >=media-libs/libmatroska-0.6.2 )
-	mozilla? ( >=net-www/mozilla-1.4 )
+	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0
diff --git a/media-video/vlc/vlc-0.7.1.ebuild b/media-video/vlc/vlc-0.7.1.ebuild
index 3f76ecd0aed4..c7a6ec968fe0 100644
--- a/media-video/vlc/vlc-0.7.1.ebuild
+++ b/media-video/vlc/vlc-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1.ebuild,v 1.10 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1.ebuild,v 1.11 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -47,7 +47,7 @@ RDEPEND="X? ( virtual/x11 )
 	lirc? ( app-misc/lirc )
 	mad? ( media-libs/libmad media-libs/libid3tag )
 	matroska? ( >=media-libs/libmatroska-0.6.2 )
-	mozilla? ( >=net-www/mozilla-1.4 )
+	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
diff --git a/media-video/vlc/vlc-0.7.2-r1.ebuild b/media-video/vlc/vlc-0.7.2-r1.ebuild
index b0e15474e78d..259d92f04723 100644
--- a/media-video/vlc/vlc-0.7.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.8 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.9 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -40,7 +40,7 @@ RDEPEND="X? ( virtual/x11 )
 	mad? ( media-libs/libmad
 		media-libs/libid3tag )
 	matroska? ( >=media-libs/libmatroska-0.7 )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0.1
diff --git a/media-video/vlc/vlc-0.7.2.ebuild b/media-video/vlc/vlc-0.7.2.ebuild
index 98ff8daebff7..d58728e6217f 100644
--- a/media-video/vlc/vlc-0.7.2.ebuild
+++ b/media-video/vlc/vlc-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.10 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.11 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -40,7 +40,7 @@ RDEPEND="X? ( virtual/x11 )
 	mad? ( media-libs/libmad
 		media-libs/libid3tag )
 	matroska? ( >=media-libs/libmatroska-0.7 )
-	mozilla? ( >=net-www/mozilla-1.4 )
+	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0
diff --git a/media-video/vlc/vlc-0.8.0.ebuild b/media-video/vlc/vlc-0.8.0.ebuild
index c9f1b3703edf..2c40c61a265b 100644
--- a/media-video/vlc/vlc-0.8.0.ebuild
+++ b/media-video/vlc/vlc-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.0.ebuild,v 1.4 2005/01/08 03:58:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.0.ebuild,v 1.5 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -40,7 +40,7 @@ RDEPEND="X? ( virtual/x11 )
 	mad? ( media-libs/libmad
 		media-libs/libid3tag )
 	matroska? ( >=media-libs/libmatroska-0.7 )
-	mozilla? ( >=net-www/mozilla-1.5 )
+	mozilla? ( >=www-client/mozilla-1.5 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0.1
diff --git a/media-video/vlc/vlc-0.8.1.ebuild b/media-video/vlc/vlc-0.8.1.ebuild
index 17117fea395c..1c85459c19e9 100644
--- a/media-video/vlc/vlc-0.8.1.ebuild
+++ b/media-video/vlc/vlc-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1.ebuild,v 1.11 2005/03/09 23:16:54 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1.ebuild,v 1.12 2005/03/23 16:18:35 seemant Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -49,7 +49,7 @@ DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
 		ncurses? ( sys-libs/ncurses )
 		xosd? ( x11-libs/xosd )
 		lirc? ( app-misc/lirc )
-		mozilla? ( net-www/mozilla )
+		mozilla? ( www-client/mozilla )
 		3dfx? ( !amd64? ( media-libs/glide-v3 ) )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
 		gnutls? ( >=net-libs/gnutls-1.0.0 )
diff --git a/net-libs/gecko-sdk/ChangeLog b/net-libs/gecko-sdk/ChangeLog
index 8ffd312ae35d..e17992bc0af3 100644
--- a/net-libs/gecko-sdk/ChangeLog
+++ b/net-libs/gecko-sdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gecko-sdk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.7 2005/02/27 19:00:55 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.8 2005/03/23 16:18:40 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gecko-sdk-1.7.5.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   27 Feb 2005; Brad Laue <brad@gentoo.org> +files/svg-cairo-0.3.0-fix.patch,
   gecko-sdk-1.7.5.ebuild:
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
index a10161779093..b876f326cc8c 100644
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
+++ b/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.2 2005/02/27 19:00:55 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.3 2005/03/23 16:18:40 seemant Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
@@ -45,25 +45,25 @@ src_unpack() {
 	if [[ $(gcc-major-version) -eq 3 ]]; then
 		# ABI Patch for alpha/xpcom for gcc-3.x
 		if [[ ${ARCH} == alpha ]]; then
-			epatch ${PORTDIR}/net-www/mozilla/files/mozilla-alpha-xpcom-subs-fix.patch
+			epatch ${PORTDIR}/www-client/mozilla/files/mozilla-alpha-xpcom-subs-fix.patch
 		fi
 	fi
 
 	# Fix stack growth logic
-	epatch ${PORTDIR}/net-www/mozilla/files/mozilla-${PV}-stackgrowth.patch
+	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-${PV}-stackgrowth.patch
 
 	# Fix logic error when using RAW target
 	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${PORTDIR}/net-www/mozilla/files/1.3/mozilla-1.3-fix-RAW-target.patch
+	epatch ${PORTDIR}/www-client/mozilla/files/1.3/mozilla-1.3-fix-RAW-target.patch
 
 	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
 	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${PORTDIR}/net-www/mozilla/files/mozilla-hppa.patch
+	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-hppa.patch
 
 	# patch out ft caching code since the API changed between releases of
 	# freetype; this enables freetype-2.1.8+ compat.
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${PORTDIR}/net-www/mozilla/files/mozilla-1.7.3-4ft2.patch
+	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-1.7.3-4ft2.patch
 
 	# Patch for newer versions of cairo ( bug #80301) 
 	if has_version '>=x11-libs/cairo-0.3.0'; then
diff --git a/net-misc/pavuk/ChangeLog b/net-misc/pavuk/ChangeLog
index 21bceb89726e..cbcb65fbdde5 100644
--- a/net-misc/pavuk/ChangeLog
+++ b/net-misc/pavuk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/pavuk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.16 2005/03/09 01:19:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.17 2005/03/23 16:18:53 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> pavuk-0.9.31.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   pavuk-0.9.31.ebuild:
diff --git a/net-misc/pavuk/pavuk-0.9.31.ebuild b/net-misc/pavuk/pavuk-0.9.31.ebuild
index d050e34c3c11..4a6473a0f806 100644
--- a/net-misc/pavuk/pavuk-0.9.31.ebuild
+++ b/net-misc/pavuk/pavuk-0.9.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.31.ebuild,v 1.5 2005/03/09 01:19:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.31.ebuild,v 1.6 2005/03/23 16:18:53 seemant Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=sys-apps/sed-4
 	ssl? ( dev-libs/openssl )
 	X? ( virtual/x11 )
 	gnome? ( gnome-base/gnome-libs )
-	mozilla? ( net-www/mozilla )
+	mozilla? ( www-client/mozilla )
 	socks5? ( net-misc/tsocks )"
 
 src_compile() {
diff --git a/net-www/kaffeine-mozilla-plugin/ChangeLog b/net-www/kaffeine-mozilla-plugin/ChangeLog
index 29e3b4ddd05a..f5cf16d9ac61 100644
--- a/net-www/kaffeine-mozilla-plugin/ChangeLog
+++ b/net-www/kaffeine-mozilla-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/kaffeine-mozilla-plugin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/kaffeine-mozilla-plugin/ChangeLog,v 1.5 2005/03/18 19:48:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/kaffeine-mozilla-plugin/ChangeLog,v 1.6 2005/03/23 16:19:04 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  kaffeine-mozilla-plugin-0.2.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   18 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   kaffeine-mozilla-plugin-0.2.ebuild:
diff --git a/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild b/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild
index 3e4a3bf2b74f..1d439c19f249 100644
--- a/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild
+++ b/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild,v 1.5 2005/03/18 19:48:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/kaffeine-mozilla-plugin/kaffeine-mozilla-plugin-0.2.ebuild,v 1.6 2005/03/23 16:19:04 seemant Exp $
 
 inherit nsplugins
 
@@ -18,7 +18,7 @@ IUSE=""
 
 DEPEND=">=media-video/kaffeine-0.4.3b"
 RDEPEND=">=media-video/kaffeine-0.4.3b
-	|| ( >=net-www/mozilla-1.6-r1 >=www-client/mozilla-firefox-0.8 )"
+	|| ( >=www-client/mozilla-1.6-r1 >=www-client/mozilla-firefox-0.8 )"
 
 src_compile() {
 	econf --prefix=/usr/lib/${PLUGINS_DIR} || die
diff --git a/net-www/mozplugger/ChangeLog b/net-www/mozplugger/ChangeLog
index 5a8bc4265dbd..c25a1c25804d 100644
--- a/net-www/mozplugger/ChangeLog
+++ b/net-www/mozplugger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mozplugger
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/ChangeLog,v 1.12 2005/03/18 19:47:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/ChangeLog,v 1.13 2005/03/23 16:19:18 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> mozplugger-1.5.2.ebuild,
+  mozplugger-1.6.2.ebuild, mozplugger-1.7.1.ebuild:
+  net-www/mozilla is now www-client/mozilla
 
   18 Mar 2005; Seemant Kulleen <seemant@gentoo.org> mozplugger-1.5.2.ebuild,
   mozplugger-1.6.2.ebuild, mozplugger-1.7.1.ebuild:
diff --git a/net-www/mozplugger/mozplugger-1.5.2.ebuild b/net-www/mozplugger/mozplugger-1.5.2.ebuild
index 9f3761fd5813..9bc3ca3c0d4a 100644
--- a/net-www/mozplugger/mozplugger-1.5.2.ebuild
+++ b/net-www/mozplugger/mozplugger-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/mozplugger-1.5.2.ebuild,v 1.11 2005/03/18 19:47:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/mozplugger-1.5.2.ebuild,v 1.12 2005/03/23 16:19:18 seemant Exp $
 
 inherit nsplugins
 
@@ -18,7 +18,7 @@ DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	!virtual/plugger
 	|| (
-		net-www/mozilla
+		www-client/mozilla
 		www-client/mozilla-firefox
 		www-client/mozilla-firefox-bin
 	)"
diff --git a/net-www/mozplugger/mozplugger-1.6.2.ebuild b/net-www/mozplugger/mozplugger-1.6.2.ebuild
index 0a2149698523..10f912e5d192 100644
--- a/net-www/mozplugger/mozplugger-1.6.2.ebuild
+++ b/net-www/mozplugger/mozplugger-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/mozplugger-1.6.2.ebuild,v 1.5 2005/03/18 19:47:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/mozplugger-1.6.2.ebuild,v 1.6 2005/03/23 16:19:18 seemant Exp $
 
 inherit nsplugins
 
@@ -18,7 +18,7 @@ DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	!virtual/plugger
 	|| (
-		net-www/mozilla
+		www-client/mozilla
 		www-client/mozilla-bin
 		www-client/mozilla-firefox
 		www-client/mozilla-firefox-bin
diff --git a/net-www/mozplugger/mozplugger-1.7.1.ebuild b/net-www/mozplugger/mozplugger-1.7.1.ebuild
index c8b6affecb90..c4c4d626e26d 100644
--- a/net-www/mozplugger/mozplugger-1.7.1.ebuild
+++ b/net-www/mozplugger/mozplugger-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/mozplugger-1.7.1.ebuild,v 1.4 2005/03/18 19:47:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozplugger/mozplugger-1.7.1.ebuild,v 1.5 2005/03/23 16:19:18 seemant Exp $
 
 inherit nsplugins
 
@@ -18,7 +18,7 @@ DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	!virtual/plugger
 	|| (
-		net-www/mozilla
+		www-client/mozilla
 		www-client/mozilla-bin
 		www-client/mozilla-firefox
 		www-client/mozilla-firefox-bin
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 80f622e1008d..0d73703105d8 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/Macaulay2
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.4 2005/03/23 15:14:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.5 2005/03/23 16:19:35 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> Macaulay2-0.9.2.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> :
   change dep from net-www/epiphany to www-client/epiphany
diff --git a/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild b/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild
index efb524a084a2..238edfa4d86d 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.2 2005/03/18 20:14:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.3 2005/03/23 16:19:35 seemant Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -62,7 +62,7 @@ src_install () {
 	if has_version 'kde-base/kdebase' ; then
 		einfo "Using konqueror as default help-browser!"
 		sed "s:netscape:konqueror:g" < tmp > ${D}/usr/bin/M2-help
-	elif has_version 'net-www/mozilla' ; then
+	elif has_version 'www-client/mozilla' ; then
 		einfo "Using mozilla as default help-browser!"
 		sed "s:netscape:mozilla:g" < tmp > ${D}/usr/bin/M2-help
 	elif has_version 'www-client/mozilla-firefox' ; then
diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index eb6e28729280..9fff236a0b03 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.4 2005/03/23 16:19:45 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  epiphany-1.2.9-r1.ebuild, epiphany-1.2.10.ebuild, epiphany-1.4.4.ebuild,
+  epiphany-1.4.5.ebuild, epiphany-1.4.6.ebuild, epiphany-1.4.7.ebuild,
+  epiphany-1.4.8.ebuild, epiphany-1.6.0.ebuild, epiphany-1.6.0-r1.ebuild,
+  epiphany-1.6.0-r2.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
 *epiphany-1.4.5 (23 Mar 2005)
 
diff --git a/www-client/epiphany/epiphany-1.2.10.ebuild b/www-client/epiphany/epiphany-1.2.10.ebuild
index d9f465268e10..45f4c58e408f 100644
--- a/www-client/epiphany/epiphany-1.2.10.ebuild
+++ b/www-client/epiphany/epiphany-1.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.2.10.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.2.10.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	gnome? ( >=gnome-base/nautilus-2.5 )"
 
 DEPEND="${RDEPEND}
diff --git a/www-client/epiphany/epiphany-1.2.9-r1.ebuild b/www-client/epiphany/epiphany-1.2.9-r1.ebuild
index 026326270fb8..a64b2235e92e 100644
--- a/www-client/epiphany/epiphany-1.2.9-r1.ebuild
+++ b/www-client/epiphany/epiphany-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.2.9-r1.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.2.9-r1.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	gnome? ( >=gnome-base/nautilus-2.5 )"
 
 DEPEND="${RDEPEND}
diff --git a/www-client/epiphany/epiphany-1.4.4.ebuild b/www-client/epiphany/epiphany-1.4.4.ebuild
index 4770bc6e889f..757f21049d13 100644
--- a/www-client/epiphany/epiphany-1.4.4.ebuild
+++ b/www-client/epiphany/epiphany-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.4.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.4.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	gnome? ( >=gnome-base/nautilus-2.5 )"
 
 DEPEND="${RDEPEND}
diff --git a/www-client/epiphany/epiphany-1.4.5.ebuild b/www-client/epiphany/epiphany-1.4.5.ebuild
index 8248e365f826..6a996e7e16b9 100644
--- a/www-client/epiphany/epiphany-1.4.5.ebuild
+++ b/www-client/epiphany/epiphany-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.5.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.5.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	gnome? ( >=gnome-base/nautilus-2.5 )"
 
 DEPEND="${RDEPEND}
diff --git a/www-client/epiphany/epiphany-1.4.6.ebuild b/www-client/epiphany/epiphany-1.4.6.ebuild
index fd0be126657a..40365391419d 100644
--- a/www-client/epiphany/epiphany-1.4.6.ebuild
+++ b/www-client/epiphany/epiphany-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.6.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.6.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	gnome? ( >=gnome-base/nautilus-2.5 )"
 
 DEPEND="${RDEPEND}
diff --git a/www-client/epiphany/epiphany-1.4.7.ebuild b/www-client/epiphany/epiphany-1.4.7.ebuild
index 2be612ab3746..06013efca32f 100644
--- a/www-client/epiphany/epiphany-1.4.7.ebuild
+++ b/www-client/epiphany/epiphany-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.7.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.7.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	gnome? ( >=gnome-base/nautilus-2.5 )"
 
 DEPEND="${RDEPEND}
diff --git a/www-client/epiphany/epiphany-1.4.8.ebuild b/www-client/epiphany/epiphany-1.4.8.ebuild
index 96d8db115c54..f78df42166d9 100644
--- a/www-client/epiphany/epiphany-1.4.8.ebuild
+++ b/www-client/epiphany/epiphany-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.8.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.8.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3"
+	>=www-client/mozilla-1.7.3"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
diff --git a/www-client/epiphany/epiphany-1.6.0-r1.ebuild b/www-client/epiphany/epiphany-1.6.0-r1.ebuild
index 8d734fa7449c..f9a27f0373ca 100644
--- a/www-client/epiphany/epiphany-1.6.0-r1.ebuild
+++ b/www-client/epiphany/epiphany-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0-r1.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0-r1.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	>=x11-themes/gnome-icon-theme-2.9.3"
 # dbus? ( >=sys-apps/dbus-0.22 )
 
diff --git a/www-client/epiphany/epiphany-1.6.0-r2.ebuild b/www-client/epiphany/epiphany-1.6.0-r2.ebuild
index 0e4e57c1e1a7..6039070e5ec5 100644
--- a/www-client/epiphany/epiphany-1.6.0-r2.ebuild
+++ b/www-client/epiphany/epiphany-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0-r2.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0-r2.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	>=x11-themes/gnome-icon-theme-2.9.3
 	>=x11-libs/startup-notification-0.5"
 # dbus? ( >=sys-apps/dbus-0.22 )
diff --git a/www-client/epiphany/epiphany-1.6.0.ebuild b/www-client/epiphany/epiphany-1.6.0.ebuild
index f5f839a6da95..3458f1bc3d59 100644
--- a/www-client/epiphany/epiphany-1.6.0.ebuild
+++ b/www-client/epiphany/epiphany-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0.ebuild,v 1.3 2005/03/23 15:10:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0.ebuild,v 1.4 2005/03/23 16:19:45 seemant Exp $
 
 inherit eutils gnome2
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
+	>=www-client/mozilla-1.7.3
 	>=x11-themes/gnome-icon-theme-2.9.3"
 # dbus? ( >=sys-apps/dbus-0.22 )
 
diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog
index 99d2fd37d70e..862d436ce421 100644
--- a/www-client/galeon/ChangeLog
+++ b/www-client/galeon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/galeon
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.2 2005/03/18 14:14:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.3 2005/03/23 16:19:58 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> galeon-1.3.17.ebuild,
+  galeon-1.3.18.ebuild, galeon-1.3.19.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
 *galeon-1.3.19 (18 Mar 2005)
 *galeon-1.3.18 (18 Mar 2005)
diff --git a/www-client/galeon/galeon-1.3.17.ebuild b/www-client/galeon/galeon-1.3.17.ebuild
index b38deeb3c310..a55c88f92135 100644
--- a/www-client/galeon/galeon-1.3.17.ebuild
+++ b/www-client/galeon/galeon-1.3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.17.ebuild,v 1.1 2005/03/18 14:13:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.17.ebuild,v 1.2 2005/03/23 16:19:58 seemant Exp $
 
 inherit gnome2 debug libtool eutils
 
@@ -16,7 +16,7 @@ SLOT="0"
 S=${WORKDIR}/${P%%a}
 
 RDEPEND="virtual/x11
-	>=net-www/mozilla-1.7.2-r1
+	>=www-client/mozilla-1.7.2-r1
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4.0
 	>=dev-libs/libxml2-2.6.6
diff --git a/www-client/galeon/galeon-1.3.18.ebuild b/www-client/galeon/galeon-1.3.18.ebuild
index dce145ba6075..888ab22b33d4 100644
--- a/www-client/galeon/galeon-1.3.18.ebuild
+++ b/www-client/galeon/galeon-1.3.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.18.ebuild,v 1.1 2005/03/18 14:13:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.18.ebuild,v 1.2 2005/03/23 16:19:58 seemant Exp $
 
 inherit gnome2 debug libtool eutils
 
@@ -16,7 +16,7 @@ SLOT="0"
 S=${WORKDIR}/${P}
 
 RDEPEND="virtual/x11
-	>=net-www/mozilla-1.7.5
+	>=www-client/mozilla-1.7.5
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4.0
 	>=dev-libs/libxml2-2.6.6
diff --git a/www-client/galeon/galeon-1.3.19.ebuild b/www-client/galeon/galeon-1.3.19.ebuild
index 629bbb8ee929..1de59dd42e05 100644
--- a/www-client/galeon/galeon-1.3.19.ebuild
+++ b/www-client/galeon/galeon-1.3.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.19.ebuild,v 1.1 2005/03/18 14:13:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.19.ebuild,v 1.2 2005/03/23 16:19:58 seemant Exp $
 
 inherit gnome2 debug libtool eutils
 
@@ -16,7 +16,7 @@ SLOT="0"
 S=${WORKDIR}/${P}
 
 RDEPEND="virtual/x11
-	>=net-www/mozilla-1.7.5
+	>=www-client/mozilla-1.7.5
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4.0
 	>=dev-libs/libxml2-2.6.6
diff --git a/www-client/kazehakase-cvs/ChangeLog b/www-client/kazehakase-cvs/ChangeLog
index 6bcd87d7fda5..004b56dbf964 100644
--- a/www-client/kazehakase-cvs/ChangeLog
+++ b/www-client/kazehakase-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/kazehakase-cvs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase-cvs/ChangeLog,v 1.2 2005/03/18 16:34:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase-cvs/ChangeLog,v 1.3 2005/03/23 16:20:05 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  kazehakase-cvs-20050301.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
 *kazehakase-cvs-20050301 (18 Mar 2005)
 
diff --git a/www-client/kazehakase-cvs/kazehakase-cvs-20050301.ebuild b/www-client/kazehakase-cvs/kazehakase-cvs-20050301.ebuild
index c48697ead7c6..17d3401c6f9d 100644
--- a/www-client/kazehakase-cvs/kazehakase-cvs-20050301.ebuild
+++ b/www-client/kazehakase-cvs/kazehakase-cvs-20050301.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase-cvs/kazehakase-cvs-20050301.ebuild,v 1.1 2005/03/18 16:32:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase-cvs/kazehakase-cvs-20050301.ebuild,v 1.2 2005/03/23 16:20:05 seemant Exp $
 
 inherit cvs
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 LICENSE="GPL-2"
 
-DEPEND=">=net-www/mozilla-1.7
+DEPEND=">=www-client/mozilla-1.7
 	x11-libs/pango
 	>=x11-libs/gtk+-2
 	dev-util/pkgconfig
@@ -35,10 +35,10 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${ECVS_MODULE}"
 
 pkg_setup(){
-	local moz_use="$(</var/db/pkg/`best_version net-www/mozilla`/USE)"
+	local moz_use="$(</var/db/pkg/`best_version www-client/mozilla`/USE)"
 
-	# >=net-www/mozilla-1.7.3-r2 always depend on gtk2.
-	if ! has_version '>=net-www/mozilla-1.7.3-r2' && ! has gtk2 ${moz_use}
+	# >=www-client/mozilla-1.7.3-r2 always depend on gtk2.
+	if ! has_version '>=www-client/mozilla-1.7.3-r2' && ! has gtk2 ${moz_use}
 	then
 		echo
 		eerror
diff --git a/www-client/skipstone/ChangeLog b/www-client/skipstone/ChangeLog
index 40d80a73f5cb..22d382ee95c6 100644
--- a/www-client/skipstone/ChangeLog
+++ b/www-client/skipstone/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/skipstone
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/skipstone/ChangeLog,v 1.2 2005/03/15 21:52:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/skipstone/ChangeLog,v 1.3 2005/03/23 16:20:23 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> skipstone-0.9.2.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
 *skipstone-0.9.2 (15 Mar 2005)
 
diff --git a/www-client/skipstone/skipstone-0.9.2.ebuild b/www-client/skipstone/skipstone-0.9.2.ebuild
index e1c23a7d2d8f..94765a85aec9 100644
--- a/www-client/skipstone/skipstone-0.9.2.ebuild
+++ b/www-client/skipstone/skipstone-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/skipstone/skipstone-0.9.2.ebuild,v 1.1 2005/03/15 21:42:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/skipstone/skipstone-0.9.2.ebuild,v 1.2 2005/03/23 16:20:23 seemant Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
-DEPEND=">=net-www/mozilla-1.6
+DEPEND=">=www-client/mozilla-1.6
 	>=x11-libs/gtk+-2.0"
 
 RDEPEND="${DEPEND}
@@ -30,7 +30,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 	use nls && myconf="${myconf} --enable-nls"
-	has_version '>=net-www/mozilla-1.7' && \
+	has_version '>=www-client/mozilla-1.7' && \
 	myconf="${myconf} --enable-cvs-mozilla"
 
 	econf ${myconf}
diff --git a/x11-libs/wxmozilla/ChangeLog b/x11-libs/wxmozilla/ChangeLog
index b174229f390a..3438ade0c3c9 100644
--- a/x11-libs/wxmozilla/ChangeLog
+++ b/x11-libs/wxmozilla/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/wxmozilla
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/ChangeLog,v 1.3 2004/12/16 21:03:48 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/ChangeLog,v 1.4 2005/03/23 16:20:30 seemant Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> wxmozilla-0.5.3.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
 
   16 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> wxmozilla-0.5.3.ebuild:
   Fix doc installation.
diff --git a/x11-libs/wxmozilla/wxmozilla-0.5.3.ebuild b/x11-libs/wxmozilla/wxmozilla-0.5.3.ebuild
index 33069c2f1fc9..41889a35291d 100644
--- a/x11-libs/wxmozilla/wxmozilla-0.5.3.ebuild
+++ b/x11-libs/wxmozilla/wxmozilla-0.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/wxmozilla-0.5.3.ebuild,v 1.3 2004/12/16 21:03:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxmozilla/wxmozilla-0.5.3.ebuild,v 1.4 2005/03/23 16:20:30 seemant Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ DESCRIPTION="Mozilla widget for wxWindows"
 SRC_URI="mirror://sourceforge/wxmozilla/${P}.tar.gz"
 HOMEPAGE="http://wxmozilla.sourceforge.net/"
 
-DEPEND=">=net-www/mozilla-1.3
+DEPEND=">=www-client/mozilla-1.3
 	python? ( dev-lang/python >=dev-python/wxpython-2.4 )
 	>=x11-libs/wxGTK-2.4"
 
@@ -20,7 +20,7 @@ KEYWORDS="~x86"
 
 pkg_setup() {
 	# make sure gtk{1,2} setting of Mozilla and wxGTK is same
-	if built_with_use net-www/mozilla gtk2; then
+	if built_with_use www-client/mozilla gtk2; then
 		tk_mozilla="gtk2"
 	else
 		tk_mozilla="gtk1"
@@ -32,7 +32,7 @@ pkg_setup() {
 	fi
 
 	if [ $tk_mozilla != $tk_wxgtk ]; then
-		eerror "You need x11-libs/wxGTK and net-www/mozilla compiled with same GTK+ version."
+		eerror "You need x11-libs/wxGTK and www-client/mozilla compiled with same GTK+ version."
 		eerror "Emerge both either with or without 'gtk2' in your USE flags."
 		eerror "wxGTK toolkit: $tk_wxgtk"
 		eerror "Mozilla toolkit: $tk_mozilla"