revision for linguas support

(Portage version: 2.1_pre3-r1)

9 files changed, 74 insertions, 175 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index 8aaa089335cb..1494ff76cb2b 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox-bin
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.31 2005/12/24 19:31:16 halcy0n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.32 2006/01/08 16:18:27 anarchy Exp $
+
+*mozilla-firefox-bin-1.5-r2 (08 Jan 2006)
+
+  08 Jan 2006; Jory A. Pratt <anarchy@gentoo.org>
+  -mozilla-firefox-bin-1.0.6-r2.ebuild, -mozilla-firefox-bin-1.5.ebuild,
+  -mozilla-firefox-bin-1.5-r1.ebuild, +mozilla-firefox-bin-1.5-r2.ebuild:
+  revision which includes linguas support
 
   24 Dec 2005; Mark Loeser <halcy0n@gentoo.org>
   mozilla-firefox-bin-1.5-r1.ebuild:
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index 562bb6170f19..bc56760bd770 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5cbd250242e2da10af421f1cb94d34fd ChangeLog 11357
-MD5 a55b185b30df1647429525139fe29ec5 files/digest-mozilla-firefox-bin-1.0.6-r2 66
+MD5 b565a59a584b844fd81cf97941215e5b ChangeLog 11521
 MD5 82be77a0991a01a626a24995353b9c7d files/digest-mozilla-firefox-bin-1.0.7 66
-MD5 868b46dc9449e24d7522e403b339beae files/digest-mozilla-firefox-bin-1.5 64
-MD5 868b46dc9449e24d7522e403b339beae files/digest-mozilla-firefox-bin-1.5-r1 64
+MD5 3706e13456e2631c796d34980eccb3c6 files/digest-mozilla-firefox-bin-1.5-r2 1411
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
 MD5 dc62e3f15845b0343d1513abada402d7 files/icon/mozillafirefox-bin.desktop 203
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 396d47202cf4e60f89cb995d46294824 mozilla-firefox-bin-1.0.6-r2.ebuild 1874
 MD5 d7aac7b9a5c3e396fd39cea71058116c mozilla-firefox-bin-1.0.7.ebuild 1869
-MD5 b32a2af84db17b97ac2e2ac6c8341915 mozilla-firefox-bin-1.5-r1.ebuild 2027
-MD5 4cb01c1fd7e83cdc8c2fa1f543f109ac mozilla-firefox-bin-1.5.ebuild 1869
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDraIOCRZPokWLroQRAutdAJ4o+IEaWBGmELEiTC2EC4MMX+RlVQCeNzds
-0BXMD8xHF6XNy+j+rAi5gG0=
-=HvhF
------END PGP SIGNATURE-----
+MD5 a0758efda163fa98de181db68d2dd5fe mozilla-firefox-bin-1.5-r2.ebuild 2959
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.6-r2 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.6-r2
deleted file mode 100644
index d4c3acc92af7..000000000000
--- a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01ff4bcf6363e3e41411b8dd39fce902 firefox-1.0.6.tar.gz 8223348
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5
deleted file mode 100644
index 61944be7beb8..000000000000
--- a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b63fcdf4863e59c93d2a29df853b6046 firefox-1.5.tar.gz 8444956
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r1 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r1
deleted file mode 100644
index 61944be7beb8..000000000000
--- a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b63fcdf4863e59c93d2a29df853b6046 firefox-1.5.tar.gz 8444956
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r2 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r2
new file mode 100644
index 000000000000..396af717cd90
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r2
@@ -0,0 +1,27 @@
+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 b63fcdf4863e59c93d2a29df853b6046 firefox-1.5.tar.gz 8444956
+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 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-bin/mozilla-firefox-bin-1.0.6-r2.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.6-r2.ebuild
deleted file mode 100644
index 58df82d33a65..000000000000
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.6-r2.ebuild,v 1.2 2005/08/11 20:21:37 flameeyes Exp $
-
-inherit eutils mozilla-launcher multilib
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/en-US/firefox-${PV}.tar.gz"
-HOMEPAGE="http://www.mozilla.org/projects/firefox"
-RESTRICT="nostrip"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/x11
-	x86? (
-		>=sys-libs/lib-compat-1.0-r2
-		>=x11-libs/gtk+-2.2
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-1.0
-		>=app-emulation/emul-linux-x86-gtklibs-1.0
-	)
-	>=www-client/mozilla-launcher-1.41"
-
-S=${WORKDIR}/firefox
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/firefox
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv ${S} ${D}${MOZILLA_FIVE_HOME}
-
-	# Create /usr/bin/firefox-bin
-	install_mozilla_launcher_stub firefox-bin ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/opt/firefox
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	if use amd64; then
-		echo
-		einfo "NB: You just installed a 32-bit firefox"
-	fi
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r2.ebuild
index eac556792f39..e0b20bd77728 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r1.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r2.ebuild
@@ -1,20 +1,26 @@
-# 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-bin/mozilla-firefox-bin-1.5-r1.ebuild,v 1.3 2005/12/24 19:31:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r2.ebuild,v 1.1 2006/01/08 16:18:27 anarchy Exp $
 
-inherit eutils mozilla-launcher multilib
+inherit eutils mozilla-launcher multilib mozextension
+
+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"
 
 DESCRIPTION="Firefox Web Browser"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/en-US/firefox-${PV}.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/firefox"
 RESTRICT="nostrip"
 
+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 ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="app-arch/unzip"
 RDEPEND="|| ( (	x11-libs/libXrender
 		x11-libs/libXt
 		x11-libs/libXmu
@@ -30,7 +36,8 @@ RDEPEND="|| ( (	x11-libs/libXrender
 		>=app-emulation/emul-linux-x86-gtklibs-1.0
 	)
 	>=www-client/mozilla-launcher-1.41
-	=virtual/libstdc++-3.3"
+	=virtual/libstdc++-3.3
+	virtual/libc"
 
 S=${WORKDIR}/firefox
 
@@ -41,6 +48,15 @@ pkg_setup() {
 	has_multilib_profile && ABI="x86"
 }
 
+src_unpack() {
+	unpack firefox-${PV}.tar.gz
+
+	strip-linguas ${LANGS} en
+	for X in ${LINGUAS/en}; do
+		xpi_unpack ${X}.xpi
+	done
+}
+
 src_install() {
 	declare MOZILLA_FIVE_HOME=/opt/firefox
 
@@ -49,6 +65,20 @@ src_install() {
 	touch ${S}/extensions/talkback@mozilla.org/chrome.manifest
 	mv ${S} ${D}${MOZILLA_FIVE_HOME}
 
+	# Locale support
+	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 changed locale"
+	fi
+
 	# Create /usr/bin/firefox-bin
 	install_mozilla_launcher_stub firefox-bin ${MOZILLA_FIVE_HOME}
 
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.ebuild
deleted file mode 100644
index a27206741f1a..000000000000
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5.ebuild,v 1.1 2005/11/29 20:05:52 anarchy Exp $
-
-inherit eutils mozilla-launcher multilib
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/en-US/firefox-${PV}.tar.gz"
-HOMEPAGE="http://www.mozilla.org/projects/firefox"
-RESTRICT="nostrip"
-
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/x11
-	x86? (
-		>=sys-libs/lib-compat-1.0-r2
-		>=x11-libs/gtk+-2.2
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-1.0
-		>=app-emulation/emul-linux-x86-gtklibs-1.0
-	)
-	>=www-client/mozilla-launcher-1.41"
-
-S=${WORKDIR}/firefox
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/firefox
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv ${S} ${D}${MOZILLA_FIVE_HOME}
-
-	# Create /usr/bin/firefox-bin
-	install_mozilla_launcher_stub firefox-bin ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/opt/firefox
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	if use amd64; then
-		echo
-		einfo "NB: You just installed a 32-bit firefox"
-	fi
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}