bug #117331, linguas support, uriloader patch updated

(Portage version: 2.1_pre3-r1)

5 files changed, 83 insertions, 82 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index c28c007ce35a..1810d4d28e84 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.123 2005/12/23 03:48:38 anarchy Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.124 2006/01/08 17:38:40 anarchy Exp $
+
+*mozilla-firefox-1.5-r9 (08 Jan 2006)
+
+  08 Jan 2006; Jory A. Pratt <anarchy@gentoo.org>
+  -mozilla-firefox-1.5-r4.ebuild, +mozilla-firefox-1.5-r9.ebuild:
+  linguas support, bug #117331, updated uriloader.patch
 
 *mozilla-firefox-1.5-r4 (23 Dec 2005)
 
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 30121b790363..6a48577c9eb4 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,4 +1,4 @@
-MD5 e569ced83cb8e399ec88c2ba25aee5d1 ChangeLog 39399
+MD5 780920c727307d5f6434d3298ada0d68 ChangeLog 39579
 MD5 cc5756b8c7af5c88b248b86c73fc5c8d files/1.5/firefox-1.1-visibility.patch 930
 MD5 7847d262e628dcac303586fe02f2e8c4 files/1.5/firefox-cairo-canvas.patch 446
 MD5 91661761f2f232b08b74f5adc4f1eff0 files/1.5/firefox-nopangoxft.patch 839
@@ -14,6 +14,7 @@ MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r2 231
 MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r3 231
 MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r4 231
 MD5 6cb9f61cd0ea68e525a6f3537a5c5563 files/digest-mozilla-firefox-1.5-r4 291
+MD5 2224f2c5cbbcff7c23969d6b0d4cb75c files/digest-mozilla-firefox-1.5-r9 1503
 MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
 MD5 2bd0dd9035dcb875b8340be358347e8d files/firefox-1.1-uriloader.patch 15300
@@ -48,3 +49,4 @@ MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564
 MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734
 MD5 43c4bd3d75cf48ccc123d5f88467096c mozilla-firefox-1.0.7-r4.ebuild 9845
 MD5 ba341c5d996b2bf70d8c555a6d42754b mozilla-firefox-1.5-r4.ebuild 9431
+MD5 b173e332807ac0a56ed10a468ace71c9 mozilla-firefox-1.5-r9.ebuild 8415
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r4 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r4
deleted file mode 100644
index 394bdc1235e2..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 cb90e9f6097b975187892682ed286544 embed-typeaheadfind-1.patch 41361
-MD5 fa915ddcadecda30ed3e13694f26a779 firefox-1.5-source.tar.bz2 34491496
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9
new file mode 100644
index 000000000000..af76259af941
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5-r9
@@ -0,0 +1,28 @@
+MD5 ab89c9ecf8402c2d6703de08879b6053 ar.xpi 153267
+MD5 58ca5cc51582ab37aa7b1605f0d91679 ca.xpi 161282
+MD5 6f81abef4371fbf65849e9bec2939f39 cs.xpi 153049
+MD5 b6a5341ffd63ef0b39b8f561afe1072e da.xpi 142463
+MD5 63de76d822b986367f2029f363e8e625 de.xpi 141056
+MD5 b1d2189b9248c994999e7e3d82885b31 el.xpi 146943
+MD5 655c2d6f95185260fad7f782729da10e es-AR.xpi 146125
+MD5 89cbf50f50ddde89a4b1cada2157f51a es-ES.xpi 132461
+MD5 a04056b74d7541da63a9a3f4e2deef38 fi.xpi 143012
+MD5 fa915ddcadecda30ed3e13694f26a779 firefox-1.5-source.tar.bz2 34491496
+MD5 5a359eedd21c01b5bd3f17830cc69310 fr.xpi 203230
+MD5 62767c9e689a4b0abadaf80abb374e2c he.xpi 144976
+MD5 08bac8b89fa2bd0740c8e24d30533f47 it.xpi 156712
+MD5 1b5f28d3a980c5a92d590219fc337f03 ja.xpi 162438
+MD5 15724eb7fb952b2dd90add37d3331ac9 ko.xpi 149473
+MD5 c1d99cb89d46d98b825acc5eac3ba668 mozilla-firefox-1.5-patches-1.0.tar.bz2 30485
+MD5 6e030a4c52bc0144e7de6f2092ba57dc nb-NO.xpi 151770
+MD5 92f8b9f0a4aaf3ebfc1b6fb74189ede3 nl.xpi 150929
+MD5 1864b9b0c82b9d30018a9537336e56bf pl.xpi 243650
+MD5 4ea8f665e814e03474d955f89711d73a pt-BR.xpi 143568
+MD5 d62c152f06dd1479441f7769635ee4e8 ro.xpi 144106
+MD5 f19c6d0e4131d04536f05f5534753c38 ru.xpi 170096
+MD5 bdc1cb09937465d5f8d6e3d3666b280d sk.xpi 153991
+MD5 a6e5d8d95c795782bd4cf9204f712424 sl.xpi 145205
+MD5 704fadd436b1443cf996fe28ea4af017 sv-SE.xpi 154919
+MD5 eff05aaf7f64bb1daa8e3d646237f077 tr.xpi 136159
+MD5 2213a8fab73a160366046fdd86eda0cc zh-CN.xpi 136431
+MD5 f017d6f4421f9bd306cdcd306def80b5 zh-TW.xpi 128229
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5-r4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild
index 04237aaf792d..2cd601ca07df 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5-r4.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5-r4.ebuild,v 1.1 2005/12/23 03:48:38 anarchy Exp ${PV}_rc3-r2.ebuild,v 1.1 2005/11/26 04:20:32 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5-r9.ebuild,v 1.1 2006/01/08 17:38:40 anarchy Exp ${PV}_rc3-r2.ebuild,v 1.1 2005/11/26 04:20:32 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -8,14 +8,20 @@ MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
 MOZ_PANGO="yes"      # Need to enable for newer .. remove here and in mozconfig
 	                 # when older is removed from tree.
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime versionator
+inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
+
+LANGS="ar ca cs da de el es-AR es-ES fi fr he it ja ko nb-NO nl pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW"
+PVER="1.0"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
 SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/embed-typeaheadfind-1.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2"
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/${X}.xpi )"
+done
 
 KEYWORDS="-* ~amd64 ~ppc ~x86"
 SLOT="0"
@@ -26,6 +32,7 @@ RDEPEND="java? ( virtual/jre )
 	>=www-client/mozilla-launcher-1.39"
 
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	java? ( >=dev-java/java-config-0.2.0 )"
 
 S=${WORKDIR}/mozilla
@@ -38,75 +45,20 @@ export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
 src_unpack() {
-	unpack firefox-${PV}-source.tar.bz2
-	cd ${S} || die "cd failed"
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/${PV}/mozilla-1.3-alpha-stubs.patch
-
-	# addresses visibility issues on ppc and amd64
-	# will not hurt to apply on other archs as well.
-	epatch ${FILESDIR}/${PV}/firefox-1.1-visibility.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/${PV}/mozilla-hppa.patch
-
-	# patch to solve segfaults on ia64, from Debian, originally from David
-	# Mosberger
-	epatch ${FILESDIR}/${PV}/mozilla-firefox-1.1a2-ia64.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# fix pkgconfig files properly to contain gentoo-locations
-	epatch ${FILESDIR}/firefox-gentoo-pkgconfig.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# patch from fedora to remove the pangoxft things
-	epatch ${FILESDIR}/${PV}/firefox-nopangoxft.patch
-	# cairo-canvas patch, only needed to build against system cairo
-	epatch ${FILESDIR}/${PV}/firefox-cairo-canvas.patch
-
-	# patch from fedora to stop crashing with gnome-vfs
-	epatch ${FILESDIR}/firefox-1.1-uriloader.patch
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# patch to fix typeahead find for browsers which embed Firefox
-	# http://bugzilla.gnome.org/show_bug.cgi?id=157435
-	epatch ${DISTDIR}/embed-typeaheadfind-1.patch
-	epatch ${FILESDIR}/${PV}/${P}-gtk.patch
+	unpack firefox-${PV}-source.tar.bz2  ${P}-patches-${PVER}.tar.bz2
 
-	# rpath fix
-	epatch ${FILESDIR}/mozilla-rpath-1.patch
-	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
+	strip-linguas ${LANGS} en
+	for X in ${LINGUAS/en}; do
+		xpi_unpack ${X}.xpi
+	done
 
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
+	if ! use alpha; then
+		rm ${WORKDIR}/patch/001_mozilla-1.3-alpha-stubs.patch.bz2
+	fi
 
-	#security fix in history
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/${P}-history.patch
-	epatch ${FILESDIR}/${PV}/${P}-mork.patch
+	# Apply our patches
+	cd ${S} || die "cd failed"
+	epatch ${WORKDIR}/patch/*
 
 	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
 	# PowerPC, because with that configuration, it detects a ppc64 system.
@@ -117,6 +69,8 @@ src_unpack() {
 		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
 			${S}/security/coreconf/arch.mk
 	fi
+
+	eautoreconf || die "failed  running eautoreconf"
 }
 
 src_compile() {
@@ -206,12 +160,25 @@ src_install() {
 	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
 		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
 
+	strip-linguas ${LANGS} en
+	for X in ${LINGUAS/en}; do
+		xpi_install ${WORKDIR}/${X}
+	done
+
+	if [ -n ${LINGUAS%% *} ] && [ "${LINGUAS%% *}" != "en" ]; then
+		ebegin "Setting default locale to ${LINGUAS%% *}"
+		sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LINGUAS%% *}\"):" \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/firefox.js \
+			${D}${MOZILLA_FIVE_HOME}/defaults/pref/firefox-l10n.js
+		eend $? || die "sed failed to change locale"
+	fi
+
 	# Create /usr/bin/firefox
 	install_mozilla_launcher_stub firefox ${MOZILLA_FIVE_HOME}
 
 	# Install icon and .desktop for menu entry
 	doicon ${FILESDIR}/icon/firefox-icon.png
-	domenu ${FILESDIR}/icon/mozillafirefox.desktop
+	domenu ${FILESDIR}/icon/mozillafirefox-1.5.desktop
 
 	# Fix icons to look the same everywhere
 	insinto ${MOZILLA_FIVE_HOME}/icons
@@ -271,12 +238,14 @@ pkg_postinst() {
 	ewarn "Please remember to rebuild any packages that you have built"
 	ewarn "against firefox. Some packages might be busted please search"
 	ewarn "http://bugs.gentoo.org if no bug is open, then please open a new"
-	ewarn "bug report so these can be fixed."
+	ewarn "bug report so these can be fixed. Before filling bugs make sure you"
+	ewarn "have moved $HOME/.mozilla our of way and tested with clean profile."
 	ewarn "Thank you! anarchy@gentoo.org."
 	echo     ""
 	einfo "I am unable to brand firefox or thunderbird officially yet."
 	einfo "You will see that everything says Deer Park cause of this."
-	einfo "As soon as I can brand it I will commit a -r1 release."
+
+	epause 15
 }
 
 pkg_postrm() {