make orbit dep gtk1 only

3 files changed, 32 insertions, 29 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index b2d5b26f404c..1e4aba2efd86 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.105 2003/07/12 09:12:45 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.106 2003/07/12 18:41:12 foser Exp $
+
+  12 Jul 2003; foser <foser@gentoo.org> mozilla-1.4.ebuild :
+  Make orbit dep gtk1 only (#18153)
 
   12 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild:
   Re-enable mozcalendar, as this builds with no dependencies anymore.
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 2053c2fe775d..ac75ec1d801f 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,43 +1,43 @@
-MD5 c8e8c48e5bef3e0da38e6f8001037536 ChangeLog 18827
+MD5 f9f43dd3dc176189f1a5da3eb5698767 mozilla-1.3-r1.ebuild 16657
 MD5 97c3777f17c2b6c320c2fa9fba74041f mozilla-1.0.1-r3.ebuild 15212
+MD5 564c916ec5f35871b461da553d748c3b mozilla-1.4.ebuild 16614
 MD5 4855edccbe0b8fcb1ee7dfb4cc3fb71a mozilla-1.1-r1.ebuild 14822
-MD5 de55659daa79b5c545b604ab3def7963 mozilla-1.2.1-r5.ebuild 20931
-MD5 f9f43dd3dc176189f1a5da3eb5698767 mozilla-1.3-r1.ebuild 16657
 MD5 5244675fb2e956e4a020f7389dd74709 mozilla-1.3-r2.ebuild 16662
-MD5 07675a8c01a2fed116c06a341536fbf7 mozilla-1.4.ebuild 16602
-MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
-MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
-MD5 eccaf421f7e91faad5f835cadca4263e files/digest-mozilla-1.1-r1 202
-MD5 08ca97500d420d77f99f60d5eeb54c1f files/digest-mozilla-1.2.1-r5 268
-MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r1 201
+MD5 59b4ae689e84fd891836adfa59f17d33 ChangeLog 18926
+MD5 de55659daa79b5c545b604ab3def7963 mozilla-1.2.1-r5.ebuild 20931
+MD5 e239c459343aa377a9c1a6fd0239e4c9 files/mozilla-1.0-asmfixes.patch 9089
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
-MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
-MD5 937ecdca5b59d442c2b0b5027ead762d files/mozilla-1.0-abi-compat-wrappers.patch 1799
 MD5 4749f0978ad569b9bcf028c75b5de9cc files/mozilla-1.0-abi-xpcom-ppc.patch 12433
-MD5 e239c459343aa377a9c1a6fd0239e4c9 files/mozilla-1.0-asmfixes.patch 9089
-MD5 2428c0ad22b38f773fb9c174722909de files/mozilla-1.0.1-platform.patch 3543
-MD5 1c48ae2eab3e01fae125748d40917e79 files/mozilla-1.0.1-sparc-xpcom.patch 4267
+MD5 937ecdca5b59d442c2b0b5027ead762d files/mozilla-1.0-abi-compat-wrappers.patch 1799
+MD5 eccaf421f7e91faad5f835cadca4263e files/digest-mozilla-1.1-r1 202
+MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r1 201
+MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
+MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
-MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
+MD5 1c48ae2eab3e01fae125748d40917e79 files/mozilla-1.0.1-sparc-xpcom.patch 4267
 MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
-MD5 614b93ca61ff42ba48eb6a5e617f0953 files/digest-mozilla-1.4 201
+MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
+MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-0.76.1-Makefile 1560
-MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
+MD5 08ca97500d420d77f99f60d5eeb54c1f files/digest-mozilla-1.2.1-r5 268
+MD5 2428c0ad22b38f773fb9c174722909de files/mozilla-1.0.1-platform.patch 3543
+MD5 614b93ca61ff42ba48eb6a5e617f0953 files/digest-mozilla-1.4 201
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 f103c0c7a936a1dd20ecce0d29ebba54 files/1.2/mozilla-1.2-image-reload-memleak.patch 1534
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
 MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
+MD5 f103c0c7a936a1dd20ecce0d29ebba54 files/1.2/mozilla-1.2-image-reload-memleak.patch 1534
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
 MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
+MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
diff --git a/net-www/mozilla/mozilla-1.4.ebuild b/net-www/mozilla/mozilla-1.4.ebuild
index f7842d18ef1c..5661e2c624c6 100644
--- a/net-www/mozilla/mozilla-1.4.ebuild
+++ b/net-www/mozilla/mozilla-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4.ebuild,v 1.8 2003/07/12 09:12:48 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4.ebuild,v 1.9 2003/07/12 18:41:13 foser Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
 # Internal USE flags that I do not really want to advertise ...
@@ -63,7 +63,6 @@ SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
 RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=gnome-base/ORBit-0.5.10-r1
 	>=dev-libs/libIDL-0.8.0
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
@@ -79,6 +78,7 @@ RDEPEND=">=x11-base/xfree-4.2.0-r11
 	( gtk2? >=dev-libs/glib-2.2.0 :
 	        =dev-libs/glib-1.2* )
 	gtk2?  ( >=x11-libs/pango-1.2.1 )
+	!gtk2? ( >=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
 	crypt? ( >=app-crypt/gnupg-1.2.1 )"