Remove mozaccess, mozxmlterm USE flags, finally.

3 files changed, 43 insertions, 36 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index cf93109e5274..538dd655961f 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.179 2004/06/26 01:42:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.180 2004/07/04 04:53:24 brad Exp $
+
+  04 Jul 2004; Brad Laue <brad@gentoo.org> mozilla-1.7.ebuild:
+  Remove mozaccess, mozxmlterm USE flags, as these are a hazard. They're not for
+  end-use, and are broken or constantly moving around upstream as it is.
 
   25 Jun 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.ebuild:
   Fix bug 54519: stop using get_number_of_jobs
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index ee322542723b..663cd3b82e98 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,40 +1,40 @@
-MD5 bca6caf0397a53e5db2b222baaf15eca mozilla-1.7.ebuild 16381
-MD5 1e41f8c02054d823209771f1606d0bea mozilla-1.6-r1.ebuild 16989
-MD5 130f3f6d39481f6084c44c0d89bc9370 ChangeLog 31705
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
+MD5 1e41f8c02054d823209771f1606d0bea mozilla-1.6-r1.ebuild 16989
+MD5 33aa0ab420f5457a1034722b14b18b08 ChangeLog 31919
+MD5 5a3a67ce43e38b603c8f8fbf95aaa31b mozilla-1.7.ebuild 16485
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
+MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
+MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
+MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
 MD5 3ad7410bd680964096c84eee3fa21abf files/mozilla-1.6-gcc-3.4.patch 460
-MD5 11cae063228d9997b2cf9f150d9837fe files/digest-mozilla-1.6-r1 201
-MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
-MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
+MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
-MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
-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 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
+MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+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 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
 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 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
+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 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 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
-MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
-MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
+MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
diff --git a/net-www/mozilla/mozilla-1.7.ebuild b/net-www/mozilla/mozilla-1.7.ebuild
index 69fdcbf4dc4e..761e0b3d13cd 100644
--- a/net-www/mozilla/mozilla-1.7.ebuild
+++ b/net-www/mozilla/mozilla-1.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.ebuild,v 1.6 2004/06/26 01:42:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.ebuild,v 1.7 2004/07/04 04:53:24 brad Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} mozcalendar mozaccess mozxmlterm mozsvg"
+IUSE="${IUSE} mozcalendar mozsvg"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
@@ -241,18 +241,21 @@ src_compile() {
 	#     typeaheadfind webservices spellcheck
 	# Non-defaults are:
 	#     xmlterm access-builtin datetime finger cview
-	if use mozxmlterm || use mozaccess; then
-		ewarn ""
-		ewarn "NB!!: The use of the non-default extensions is considered"
-		ewarn "unsupported, and these may not always compile properly."
-		ewarn "Please do not use if you do not know what you're doing!"
-		ewarn ""
-		sleep 3
-	fi
+
+	# Remove access and xmlterm as options since they're preventing the build
+	# more than they work. (04 Jul 2004 brad)
+	#if use mozxmlterm || use mozaccess; then
+	#	ewarn ""
+	#	ewarn "NB!!: The use of the non-default extensions is considered"
+	#	ewarn "unsupported, and these may not always compile properly."
+	#	ewarn "Please do not use if you do not know what you're doing!"
+	#	ewarn ""
+	#	sleep 3
+	#fi
 
 	local myext="default"
-	use mozxmlterm && myext="${myext},xmlterm"
-	use mozaccess  && myext="${myext},access-builtin"
+	#use mozxmlterm && myext="${myext},xmlterm"
+	#use mozaccess  && myext="${myext},access-builtin"
 	use moznoirc   && myext="${myext},-irc"
 
 	####################################