--- /usr/portage/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r6.ebuild.orig	2005-08-14 23:36:01.000000000 +0200
+++ /usr/portage/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r6.ebuild	2005-08-17 20:15:28.000000000 +0200
@@ -17,7 +17,11 @@
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE="gnome java mozdevelop mozsvg ssl"
+
+if [ "x${LINGUAS}" == "x" ]; then
+	LINGUAS="en-US"
+fi
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
 # and is required to build with support for cairo.  #71504
@@ -27,7 +31,11 @@
 		!<x11-base/xorg-x11-6.7.0-r2
 		x11-libs/cairo
 	)
-	>=www-client/mozilla-launcher-1.39"
+	>=www-client/mozilla-launcher-1.39
+	dev-util/cvs
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
@@ -42,6 +50,15 @@
 export MOZ_PHOENIX=1
 
 src_unpack() {
+	einfo "Building Firefox in language (l10n code): ${LINGUAS}"
+
+	if [ "${LINGUAS}" != "en-US" ]; then
+		#cvs -q -f -z4 -d:pserver:anonymous@cvs-mirror.mozilla.org:/l10n co -rFIREFOX_${PV//./_}_RELEASE mozilla/browser/locales/${LINGUAS}
+		#cvs -q -f -z4 -d:pserver:anonymous@cvs-mirror.mozilla.org:/l10n co -rFIREFOX_${PV//./_}_RELEASE mozilla/toolkit/locales/${LINGUAS}
+		cvs -q -f -z4 -d:pserver:anonymous@cvs-mirror.mozilla.org:/l10n co -rFIREFOX_1_0_3_RELEASE mozilla/browser/locales/${LINGUAS}
+		cvs -q -f -z4 -d:pserver:anonymous@cvs-mirror.mozilla.org:/l10n co -rFIREFOX_1_0_3_RELEASE mozilla/toolkit/locales/${LINGUAS}
+	fi
+
 	declare x
 
 	for x in ${A}; do
@@ -90,6 +107,11 @@
 		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
 	fi
 
+	# Patch for newer versions of cairo #98828
+	if has_version '>=x11-libs/cairo-0.5.0'; then
+		epatch ${FILESDIR}/moz-svg-renderer_newer_cairo.diff
+	fi
+
 	####################################
 	#
 	# behavioral fixes
@@ -140,6 +162,9 @@
 
 	mozconfig_init
 
+	# localization
+	mozconfig_annotate '' --enable-ui-locale=${LINGUAS}
+
 	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
 	# regardless of java setting.
 	mozconfig_annotate '' --enable-oji --enable-mathml --enable-extensions=typeaheadfind
@@ -153,6 +178,7 @@
 	mozconfig_use_enable mozcalendar calendar
 	mozconfig_use_enable mozsvg svg
 	mozconfig_use_enable mozsvg svg-renderer-cairo
+	mozconfig_use_enable mozsvg system-cairo
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 	#mozconfig_annotate '' --with-user-appdir=.firefox