--- /usr/portage/eclass/mozilla-launcher.eclass	2005-07-28 16:35:37.000000000 -0500
+++ ../gentoo/eclass/mozilla-launcher.eclass	2006-10-27 12:42:21.545066296 -0500
@@ -4,6 +4,8 @@
 
 inherit nsplugins multilib
 
+IUSE="moznopango"
+
 # update_mozilla_launcher_symlinks
 # --------------------------------
 # Create or remove the following symlinks in /usr/bin:
@@ -65,6 +67,8 @@
 	declare libdir=$2
 
 	dodir /usr/bin
+
+	if  ! use moznopango; then
 	cat <<EOF >${D}/usr/bin/${name}
 #!/bin/sh
 #
@@ -77,5 +81,29 @@
 export MOZ_PLUGIN_PATH=\${MOZ_PLUGIN_PATH:-/usr/$(get_libdir)/$PLUGINS_DIR}
 exec /usr/libexec/mozilla-launcher "\$@"
 EOF
+	else
+	cat <<EOF >${D}/usr/bin/${name}
+#!/bin/sh
+#
+# Stub script to run mozilla-launcher.  We used to use a symlink here
+# but OOo brokenness makes it necessary to use a stub instead:
+# http://bugs.gentoo.org/show_bug.cgi?id=78890
+
+export MOZILLA_LAUNCHER=${name}
+export MOZILLA_LIBDIR=${libdir}
+export MOZ_PLUGIN_PATH=\${MOZ_PLUGIN_PATH:-/usr/$(get_libdir)/$PLUGINS_DIR}
+export MOZ_DISABLE_PANGO=1
+exec /usr/libexec/mozilla-launcher "\$@"
+EOF
+	fi
 	chmod 0755 ${D}/usr/bin/${name}
 }
+
+warn_mozilla_launcher_stub() {
+
+	elog "Not all locales support the disabling of pango."
+	elog "If your locale does not support disabling pango,"
+	elog "please open a bug report on http://bugs.gentoo.org"
+	elog "Then we can filter around the problem with those"
+	elog "specific locales."
+}