Remove mozaccess for now

3 files changed, 23 insertions, 17 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 1e496dee4d2f..ec6bfdf55b7e 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,10 @@
 # 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.135 2003/11/22 20:39:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.136 2003/11/27 14:51:57 brad Exp $
+
+  27 Nov 2003; Brad Laue <brad@gentoo.org> mozilla-1.5-r1.ebuild:
+  Remove the mozaccess USE flag, as the warning isn't enough to prevent people
+  from valiantly trying to build it :P
 
   22 Nov 2003; Jason Wever <weeve@gentoo.org> mozilla-1.5-r1.ebuild:
   Marked stable on sparc.
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 218af1f2e2df..52371dafceee 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,17 +1,19 @@
-MD5 65d1e043810734969d10387fa4b0fa99 ChangeLog 23551
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 b8036fc580046725c243d8faf9753808 mozilla-1.4-r3.ebuild 16729
-MD5 1e61ec5a5d9efbacd2135c3c55dd4080 mozilla-1.6a.ebuild 16919
 MD5 3d428c2cf97c36c769ff7ac419996aa5 mozilla-1.3-r2.ebuild 16750
+MD5 b8036fc580046725c243d8faf9753808 mozilla-1.4-r3.ebuild 16729
 MD5 ae6f8c3a96767d491dd65c111d6340cc mozilla-1.4-r4.ebuild 17265
-MD5 6e8e847d464feea0e901b10f7e321099 mozilla-1.5.ebuild 16429
 MD5 f24b7db89d2f74e9065e1bf4dd9061c4 mozilla-1.4.1.ebuild 17256
-MD5 f86636359c3592d1703995d982d619c4 mozilla-1.5-r1.ebuild 16914
+MD5 6e8e847d464feea0e901b10f7e321099 mozilla-1.5.ebuild 16429
+MD5 1e61ec5a5d9efbacd2135c3c55dd4080 mozilla-1.6a.ebuild 16919
+MD5 025311cae33ba6519c4446bcd3f5cd83 mozilla-1.5-r1.ebuild 16988
+MD5 969f1f319e719c131ab960c2de3f6951 ChangeLog 23735
 MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
-MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
-MD5 8c884b095f6624cda1c74bcf98624517 files/digest-mozilla-1.6a 202
 MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
+MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
 MD5 3fc638d05bf40a6d7a5d3296ee2a0449 files/digest-mozilla-1.4-r4 201
+MD5 28cbb765c235caf88a998f8a413d29f3 files/digest-mozilla-1.4.1 196
+MD5 14ab5596f8ab82d99af369a72d6c7d6e files/digest-mozilla-1.5 201
+MD5 75e7de2ef297a2260862175d3289cb45 files/digest-mozilla-1.5-r1 201
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
@@ -23,9 +25,7 @@ MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
 MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 14ab5596f8ab82d99af369a72d6c7d6e files/digest-mozilla-1.5 201
-MD5 28cbb765c235caf88a998f8a413d29f3 files/digest-mozilla-1.4.1 196
-MD5 75e7de2ef297a2260862175d3289cb45 files/digest-mozilla-1.5-r1 201
+MD5 8c884b095f6624cda1c74bcf98624517 files/digest-mozilla-1.6a 202
 MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
 MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
diff --git a/net-www/mozilla/mozilla-1.5-r1.ebuild b/net-www/mozilla/mozilla-1.5-r1.ebuild
index 4ae0a4563948..6407843e4e26 100644
--- a/net-www/mozilla/mozilla-1.5-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.5-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.5-r1.ebuild,v 1.6 2003/11/22 20:39:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.5-r1.ebuild,v 1.7 2003/11/27 14:51:57 brad Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} mozcalendar mozaccess mozxmlterm"
+IUSE="${IUSE} mozcalendar mozxmlterm"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
 
 inherit flag-o-matic gcc eutils nsplugins
@@ -272,10 +272,12 @@ src_compile() {
 	then
 		myext="${myext},xmlterm"
 	fi
-	if [ -n "`use mozaccess`" ]
-	then
-		myext="${myext},access-builtin"
-	fi
+
+	# Kill mozaccess as it no longer builds, and the above warning is insufficient
+#	if [ -n "`use mozaccess`" ]
+#	then
+#		myext="${myext},access-builtin"
+#	fi
 	if [ -n "`use moznoirc`" ]
 	then
 		myext="${myext},-irc"