revert accidental mozilla commit

1 files changed, 57 insertions, 120 deletions

diff --git a/eclass/mozilla.eclass b/eclass/mozilla.eclass
index 9327c0c10329..8962b71aad16 100644
--- a/eclass/mozilla.eclass
+++ b/eclass/mozilla.eclass
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.5 2004/08/07 04:24:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.6 2004/08/07 04:27:28 agriffis Exp $
 
 ECLASS=mozilla
 INHERITED="$INHERITED $ECLASS"
 
-IUSE="java gnome gtk2 ldap debug xinerama xprint"
+IUSE="java gtk2 ldap debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} mozsvg moznoxft mozdevelop mozplaintext mozxmlterm"
+IUSE="${IUSE} mozsvg moznoxft"
 
 RDEPEND="virtual/x11
 	!moznoxft ( virtual/xft )
@@ -29,17 +29,13 @@ RDEPEND="virtual/x11
 		=x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2*
 		>=gnome-base/ORBit-0.5.10-r1 )
-	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )
 	>=net-www/mozilla-launcher-1.15"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 mozilla_conf() {
-	declare enable_optimize pango_version myext
-	declare MOZ=$([[ ${PN} == mozilla ]] && echo true || echo false)
-	declare FF=$([[ ${PN} == *firefox ]] && echo true || echo false)
-	declare TB=$([[ ${PN} == *thunderbird ]] && echo true || echo false)
+	declare enable_optimize
 
 	####################################
 	#
@@ -71,6 +67,10 @@ mozilla_conf() {
 	# -O -O1 and -O2
 	strip-flags
 
+	# This was in mozilla and thunderbird but not firefox.  I'm dropping it
+	# because I don't see the point in forcing it on (04 Aug 2004 agriffis)
+	#append-flags -fforce-addr
+
 	# Additional ARCH support
 	case "${ARCH}" in
 	ppc)
@@ -95,17 +95,14 @@ mozilla_conf() {
 				replace-flags -march=pentium4 -march=pentium3
 				filter-flags -msse2
 			fi
+			# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
 		fi
 		;;
 	esac
 
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
-		myconf="${myconf} --enable-old-abi-compat-wrappers"
-
-		# Needed to build without warnings on gcc-3
-		CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
-	fi
+	# Needed to build without warnings on gcc-3
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
 	####################################
 	#
@@ -113,11 +110,8 @@ mozilla_conf() {
 	#
 	####################################
 
-	# myconf should be declared local by the caller (src_compile).
+	# myconf should be declared local by the caller (src_compile)
 	myconf="\
-		--disable-activex \
-		--disable-activex-scripting \
-		--disable-installer \
 		--disable-pedantic \
 		--enable-crypto \
 		--enable-mathml \
@@ -126,23 +120,32 @@ mozilla_conf() {
 		--enable-xterm-updates \
 		--with-pthreads \
 		--with-system-jpeg \
+		--with-system-mng \
 		--with-system-png \
 		--with-system-zlib \
-		--with-x \
 		--without-system-nspr \
 		$(use_enable ipv6) \
+		$(use_enable java java-supplement) \
 		$(use_enable ldap) \
-		$(use_enable ldap ldap-experimental) \
 		$(use_enable xinerama) \
-		$(use_enable xprint) \
-		$(use_enable gnome gnomevfs)"
+		$(use_enable xprint)"
 
 	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
 	#       tested ok -- azarah
 	if use gtk2; then
-		myconf="${myconf} --enable-default-toolkit=gtk2"
+		myconf="${myconf}
+			--enable-toolkit-gtk2 \
+			--enable-default-toolkit=gtk2 \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk"
 	else
-		myconf="${myconf} --enable-default-toolkit=gtk"
+		myconf="${myconf}
+			--enable-toolkit-gtk \
+			--enable-default-toolkit=gtk \
+			--disable-toolkit-qt \
+			--disable-toolkit-xlib \
+			--disable-toolkit-gtk2"
 	fi
 
 	if ! use debug; then
@@ -161,109 +164,43 @@ mozilla_conf() {
 		fi
 	fi
 
-	# Check if we should enable Xft support...
-	if use moznoxft; then
-		einfo "Building without Xft2.0 support (moznoxft)"
-		myconf="${myconf} --disable-xft"
-	elif use gtk2; then
-		# We need Xft2.0 locally installed
-		if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
-			# We also need pango-1.1, else Mozilla links to both
-			# Xft1.1 *and* Xft2.0, and segfault...
-			pango_version=$(pkg-config --modversion pango | cut -d. -f1,2)
-			if [[ ${pango_version//.} -gt 10 ]]; then
-				einfo "Building with Xft2.0 (Gtk+-2.0) support"
-				myconf="${myconf} --enable-xft"
-				touch ${WORKDIR}/.xft
+	# Check if we should enable Xft support ...
+	if ! use moznoxft; then
+		if use gtk2; then
+			local pango_version=""
+
+			# We need Xft2.0 localy installed
+			if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
+				pango_version=$(pkg-config --modversion pango | cut -d. -f1,2)
+
+				# We also need pango-1.1, else Mozilla links to both
+				# Xft1.1 *and* Xft2.0, and segfault...
+				if [[ ${pango_version//.} -gt 10 ]]; then
+					einfo "Building with Xft2.0 (Gtk+-2.0) support"
+					myconf="${myconf} --enable-xft --disable-freetype2"
+					touch ${WORKDIR}/.xft
+				else
+					ewarn "Building without Xft2.0 support (bad pango)"
+					myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+				fi
 			else
-				ewarn "Building without Xft2.0 support (bad pango)"
-				myconf="${myconf} --disable-xft"
+				ewarn "Building without Xft2.0 support (no pkg-config xft)"
+				myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
 			fi
 		else
-			ewarn "Building without Xft2.0 support (no pkg-config xft)"
-			myconf="${myconf} --disable-xft"
-		fi
-	else
-		einfo "Building with Xft2.0 (Gtk+-1.0) support"
-		myconf="${myconf} --enable-xft"
-		touch ${WORKDIR}/.xft
-	fi
-
-	# Freetype support used to be inversely tied to xft support.  Looking in the
-	# -bin versions it's apparent that mozilla.org builds with both enabled, so
-	# we'll allow that too.
-	myconf="${myconf} \
-		$(use_enable truetype freetype2) \
-		$(use_enable truetype freetypetest)"
-
-	# Support some development/debugging stuff for web developers
-	if ( ${MOZ} || ${FF} ) && use mozdevelop; then
-		myconf="${myconf} \
-			--enable-jsd"
-	else
-		myconf="${myconf} \
-			--disable-jsd"
-	fi
-
-	# Some browser-only flags
-	if ${MOZ} || ${FF}; then
-		myconf="${myconf} $(use_enable java oji)"
-		# Re-enabled per bug 24522 (28 Apr 2004 agriffis)
-		if use mozsvg; then
-			export MOZ_INTERNAL_LIBART_LGPL=1
-			myconf="${myconf} --enable-svg --enable-svg-renderer-libart"
-		else
-			# TB doesn't build with SVG enabled as of version 0.7.3
-			myconf="${myconf} --disable-svg"
+			einfo "Building with Xft2.0 (Gtk+-1.0) support"
+			myconf="${myconf} --enable-xft --disable-freetype2"
+			touch ${WORKDIR}/.xft
 		fi
 	else
-		myconf="${myconf} \
-			--disable-oji \
-			--disable-svg"
-	fi
-
-	# Some mailer-only flags
-	if ${MOZ} || ${TB}; then
-		if use mozplaintext; then
-			myconf="${myconf} --enable-plaintext-editor-only"
-		fi
-	else
-		myconf="${myconf} --disable-mailnews"
+		einfo "Building without Xft2.0 support (moznoxft)"
+		myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
 	fi
 
-	# Some moz-only flags
-	if ${MOZ}; then
-		myconf="${myconf} $(use_enable mozcalendar calendar)"
-		if use moznomail && ! use mozcalendar; then
-			myconf="${myconf} --disable-mailnews"
-		fi
-		if use moznocompose && use moznomail; then
-			myconf="${myconf} --disable-composer"
-		fi
-	else
-		myconf="${myconf} --disable-calendar"
+	if [[ ${myconf} == *--enable-xft* ]]; then
+		# This might just be an historical artifact...
+		export MOZ_ENABLE_XFT=1
 	fi
-
-	# Setup extensions
-	myext="default"			# starting point
-	${M} || ${FF} && addext cookie || addext -cookie
-	${M} || ${FF} && use mozdevelop && addext cview || addext -cview
-	${M} || ${FF} && addext finger || addext -finger
-	use gnome && addext gnomevfs || addext -gnomevfs
-	${M} || ${FF} && use mozdevelop && addext inspector || addext -inspector
-	${FF} || ${TB} || use moznoirc && addext -irc || addext irc
-	${M} || ${FF} && use mozdevelop && addext layout-debug || addext -layout-debug
-	${M} || ${TB} && addext spellcheck || addext -spellcheck
-	${M} || ${FF} && use mozdevelop && addext venkman || addext -venkman
-	${TB} && addext -wallet,-webservices,-xmlextras
-	${M} && use mozxmlterm && addext xmlterm || addext -xmlterm
-	${FF} || ${TB} && addext -help	# seems to be broken in 0.9.3
-
-	myconf="${myconf} --enable-extensions=${myext}"
-}
-
-addext() {
-	myext="${myext}${myext:+,}$1"
 }
 
 # Simulate the silly csh makemake script