--- swt-3.2_pre1.ebuild.orig	2006-01-29 12:24:58.000000000 -0500
+++ swt-3.2_pre1.ebuild	2006-01-29 11:52:02.000000000 -0500
@@ -20,9 +20,9 @@
 IUSE="accessibility cairo firefox gnome mozilla"
 RDEPEND=">=virtual/jre-1.4
 		 >=x11-libs/gtk+-2.6.8
-		 mozilla? (
-		 			 firefox? ( >=www-client/mozilla-firefox-1.0.6 )
-					!firefox? ( >=www-client/mozilla-1.4 )
+		firefox? ( >=www-client/mozilla-firefox-1.0.6 )
+		!firefox? (
+					mozilla? ( >=www-client/mozilla-1.4 )
 				  )
 		 gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 		 cairo? ( >=x11-libs/cairo-1.0.2 )"
@@ -34,19 +34,6 @@
 
 S=${WORKDIR}
 
-pkg_setup() {
-	if use firefox ; then
-		if ! use mozilla ; then
-			echo
-			ewarn "You must enable the mozilla useflag to build the browser"
-			ewarn "component.  The firefox flag is used only to determine"
-			ewarn "what to build against."
-
-			die "Firefox useflag enabled without mozilla support"
-		fi
-	fi
-}
-
 src_unpack() {
 	# Extract based on architecture
 	unpack ${A} || die "Unable to unpack sources"
@@ -116,7 +103,7 @@
 		emake -f make_linux.mak make_gnome || die "Failed to build GNOME VFS support"
 	fi
 
-	if use mozilla ; then
+	if use firefox || use mozilla ; then
 		if use firefox ; then
 			GECKO_SDK="$(pkg-config firefox-xpcom --variable=libdir)"
 		else