Fix bug 33159 by making virtual/xft dependant on !moznoxft. This is really kinda silly since mozilla requires xfree, which provides virtual/xft, but whatever. Also remove deprecated ? : syntax from DEPEND

5 files changed, 59 insertions, 45 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 470c31efd696..8e1cfe325997 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.151 2004/03/20 18:23:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.152 2004/03/21 05:27:33 agriffis Exp $
+
+  21 Mar 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.5-r1.ebuild,
+  mozilla-1.6-r1.ebuild, mozilla-1.6.ebuild, mozilla-1.7_alpha.ebuild:
+  Fix bug 33159 by making virtual/xft dependant on !moznoxft. This is really
+  kinda silly since mozilla requires xfree, which provides virtual/xft, but
+  whatever. Also remove deprecated ? : syntax from DEPEND
 
   18 Mar 2004; Aron Griffis <agriffis@gentoo.org> files/mozilla.sh:
   Fix bug 25556 by using "$@" instead of $* in mozilla.sh, thanks to Zhen Lin
diff --git a/net-www/mozilla/mozilla-1.5-r1.ebuild b/net-www/mozilla/mozilla-1.5-r1.ebuild
index 5c051afe597a..ebf5962b658d 100644
--- a/net-www/mozilla/mozilla-1.5-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.11 2004/01/30 07:18:50 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.5-r1.ebuild,v 1.12 2004/03/21 05:27:33 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -72,22 +72,24 @@ SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
 RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=dev-libs/libIDL-0.8.0
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
-	virtual/xft
+	!moznoxft ( virtual/xft )
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-apps/portage-2.0.14
 	dev-libs/expat
 	app-arch/zip
 	app-arch/unzip
-	( gtk2? >=x11-libs/gtk+-2.2.0 :
-	        =x11-libs/gtk+-1.2* )
-	( 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 )
+	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 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
 	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
@@ -255,8 +257,8 @@ src_compile() {
 	#        do not know what you are doing!
 	#
 	# The defaults are:
-	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix 
-	# venkman inspector irc universalchardet typeaheadfind webservices 
+	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix
+	# venkman inspector irc universalchardet typeaheadfind webservices
 	# spellcheck
 	# Non-defaults are:
 	#     xmlterm access-builtin datetime finger cview
diff --git a/net-www/mozilla/mozilla-1.6-r1.ebuild b/net-www/mozilla/mozilla-1.6-r1.ebuild
index 287bf3096f3c..05bf41eedc80 100644
--- a/net-www/mozilla/mozilla-1.6-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.4 2004/03/09 23:36:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6-r1.ebuild,v 1.5 2004/03/21 05:27:33 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -72,22 +72,24 @@ SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
 RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=dev-libs/libIDL-0.8.0
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
-	virtual/xft
+	!moznoxft ( virtual/xft )
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-apps/portage-2.0.14
 	dev-libs/expat
 	app-arch/zip
 	app-arch/unzip
-	( gtk2? >=x11-libs/gtk+-2.2.0 :
-	        =x11-libs/gtk+-1.2* )
-	( 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 )
+	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 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
 	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
@@ -254,8 +256,8 @@ src_compile() {
 	#        do not know what you are doing!
 	#
 	# The defaults are:
-	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix 
-	# venkman inspector irc universalchardet typeaheadfind webservices 
+	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix
+	# venkman inspector irc universalchardet typeaheadfind webservices
 	# spellcheck
 	# Non-defaults are:
 	#     xmlterm access-builtin datetime finger cview
diff --git a/net-www/mozilla/mozilla-1.6.ebuild b/net-www/mozilla/mozilla-1.6.ebuild
index 2f2d7b4a5fad..584f60571842 100644
--- a/net-www/mozilla/mozilla-1.6.ebuild
+++ b/net-www/mozilla/mozilla-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6.ebuild,v 1.7 2004/02/24 21:26:25 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6.ebuild,v 1.8 2004/03/21 05:27:33 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -72,22 +72,24 @@ SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
 RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=dev-libs/libIDL-0.8.0
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
-	virtual/xft
+	!moznoxft ( virtual/xft )
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-apps/portage-2.0.14
 	dev-libs/expat
 	app-arch/zip
 	app-arch/unzip
-	( gtk2? >=x11-libs/gtk+-2.2.0 :
-	        =x11-libs/gtk+-1.2* )
-	( 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 )
+	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 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
 	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
@@ -254,8 +256,8 @@ src_compile() {
 	#        do not know what you are doing!
 	#
 	# The defaults are:
-	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix 
-	# venkman inspector irc universalchardet typeaheadfind webservices 
+	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix
+	# venkman inspector irc universalchardet typeaheadfind webservices
 	# spellcheck
 	# Non-defaults are:
 	#     xmlterm access-builtin datetime finger cview
diff --git a/net-www/mozilla/mozilla-1.7_alpha.ebuild b/net-www/mozilla/mozilla-1.7_alpha.ebuild
index 0483a9620a42..0db077b163be 100644
--- a/net-www/mozilla/mozilla-1.7_alpha.ebuild
+++ b/net-www/mozilla/mozilla-1.7_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_alpha.ebuild,v 1.1 2004/02/25 15:17:11 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_alpha.ebuild,v 1.2 2004/03/21 05:27:33 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama"
 # Internal USE flags that I do not really want to advertise ...
@@ -72,22 +72,24 @@ SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
 RDEPEND=">=x11-base/xfree-4.2.0-r11
-	>=dev-libs/libIDL-0.8.0
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/fontconfig-2.1
-	virtual/xft
+	!moznoxft ( virtual/xft )
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	>=sys-apps/portage-2.0.14
 	dev-libs/expat
 	app-arch/zip
 	app-arch/unzip
-	( gtk2? >=x11-libs/gtk+-2.2.0 :
-	        =x11-libs/gtk+-1.2* )
-	( 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 )
+	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 )
+	!gtk2? (
+		=x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2*
+		>=gnome-base/ORBit-0.5.10-r1 )
 	java?  ( virtual/jre )
 	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
@@ -252,8 +254,8 @@ src_compile() {
 	#        do not know what you are doing!
 	#
 	# The defaults are:
-	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix 
-	# venkman inspector irc universalchardet typeaheadfind webservices 
+	# cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix
+	# venkman inspector irc universalchardet typeaheadfind webservices
 	# spellcheck
 	# Non-defaults are:
 	#     xmlterm access-builtin datetime finger cview