--- mozconfig.eclass.orig	2004-11-30 23:38:08.000000000 +0000
+++ mozconfig.eclass	2004-12-05 10:36:38.000000000 +0000
@@ -7,7 +7,7 @@
 ECLASS=mozconfig
 INHERITED="$INHERITED $ECLASS"

-IUSE="java gnome ldap debug xinerama xprint moznoxft"
+IUSE="java gnome gtk2 ldap debug xinerama xprint moznoxft"
 case ${PN} in
 	mozilla)	IUSE="${IUSE} mozdevelop mozxmlterm mozsvg" ;;
 	*firefox)	IUSE="${IUSE} mozdevelop mozxmlterm" ;;
@@ -25,11 +25,16 @@
 	app-arch/zip
 	app-arch/unzip
 	>=net-www/mozilla-launcher-1.22
-	>=x11-libs/gtk+-2.2.0
-	>=dev-libs/glib-2.2.0
-	>=x11-libs/pango-1.2.1
-	>=dev-libs/libIDL-0.8.0
-	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )"
+	gtk2? (
+		>=x11-libs/gtk+-2.2.0
+		>=dev-libs/glib-2.2.0
+		>=x11-libs/pango-1.2.1
+		>=dev-libs/libIDL-0.8.0
+		gnome? ( >=gnome-base/gnome-vfs-2.3.5 ) )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		=gnome-base/orbit-0* )"

 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -147,15 +152,29 @@
 	#
 	####################################

-	mozconfig_annotate gentoo \
-		--disable-installer \
-		--disable-pedantic \
-		--enable-crypto \
-		--with-system-jpeg \
-		--with-system-png \
-		--with-system-zlib \
-		--without-system-nspr \
-		--enable-default-toolkit=gtk2
+	if use gtk2; then
+		mozconfig_annotate gentoo \
+		    --disable-installer \
+		    --disable-pedantic \
+		    --enable-crypto \
+		    --with-system-jpeg \
+		    --with-system-png \
+		    --with-system-zlib \
+		    --without-system-nspr \
+		    --enable-default-toolkit=gtk2
+	else
+		mozconfig_annotate gentoo \
+		    --disable-installer \
+		    --disable-pedantic \
+		    --enable-crypto \
+		    --with-system-jpeg \
+		    --with-system-png \
+		    --with-system-zlib \
+		    --without-system-nspr \
+		    --enable-default-toolkit=gtk \
+		    --disable-gnomevfs
+	fi
+
 	mozconfig_use_enable ipv6
 	mozconfig_use_enable xinerama
 	mozconfig_use_enable xprint
--- mozilla-firefox-1.0-r3.ebuild.orig	2004-12-03 17:41:34.000000000 +0000
+++ mozilla-firefox-1.0-r3.ebuild	2004-12-04 10:34:49.000000000 +0000
@@ -14,7 +14,7 @@
 LICENSE="MPL-1.1 NPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="java mozsvg"
+IUSE="java mozsvg gtk2"

 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
 # and is required to build with support for cairo.  #71504
@@ -23,7 +23,8 @@
 	mozsvg? (
 		>=x11-base/xorg-x11-6.7.0-r2
 		x11-libs/cairo
-	)"
+	)
+	"

 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
@@ -67,6 +68,7 @@
 	mozconfig_use_enable mozdevelop jsd
 	mozconfig_use_enable mozdevelop xpctools
 	mozconfig_use_extension mozdevelop venkman
+	mozconfig_use_enable gtk2 gtk2
 	mozconfig_use_enable gnome gnomevfs
 	mozconfig_use_extension gnome gnomevfs
 	mozconfig_use_enable mozsvg svg