[www-client/firefox-bin] version bump to 21.0

4 files changed, 57 insertions, 12 deletions

diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 7259614..c2507f7 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,5 +1,7 @@
 AUX 10firefox-bin 32 SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08 SHA512 24f2c370316540b70b2053e2ac0c8ca67714c928d570c9df9dbeb3b179f29b78e7f6dbdad6e452ef312b796f68f4d7105c92f027e75a56f07084ea9ccb58ab69 WHIRLPOOL ad74d82fb1c9c17cc7b7a5a59dd2a27e0fba26c551cc3127066ddda0b9298a37a14bbaf0a3c4c4fce45aed82e7334a0458851c032fcafdc3fb51eca27d550acc
+AUX all-gentoo.js 282 SHA256 96e0361989f2fb457ac757c9c28345ca257ee5628a0ba7ee47c10beaabd3440b SHA512 afe6bb385892bbebef21d13f97e233daf2fdbe0d1772049f443a5b8c19c6d707e5562f0277ccdee5fa9aed68720f7eb062907855a7114cbd2abe58dc2444b607 WHIRLPOOL 8fd6182ecf00d6b31e3c21b1efd5c43add839ecf36498bed6ad7b3ecae5222599cff3b4fc063ddeb829f689fd9e555913f6dc869ac78138468972c62807fff34
 AUX firefox-bin-prefs.js 305 SHA256 786fbfc99425ed9ba32d3e99af6b482226539a86e762197cc10e2b491c7b9d72 SHA512 ef65b9a24f22cf04def4962721056869392dddabdac80e6f9cd92c57d58174667475ae55d83fa43603e93dcb1745568d82bcad8c810fb597dd51f2b5099bd69e WHIRLPOOL e19e8e1d4820b8356103ecd358f2e455ca00f6ed59eba6996a032cf97bcd5d3d1af9624e69eb68dbe3e2d4208e1d14e0355407194d9230098b1a118c213ef97d
 AUX firefox-bin.desktop 330 SHA256 5aa85d89a45e4d6706bc046173ff3be10d7af729b04b88f2378cdbda602b648a SHA512 b1838ba89c756e8af226503989d2689a78874af5575bb25a3184c4d09d3393bf3718e22cf4c03ff0ccb17bc04d4c00e84f5fb5500a4a88f4b921613b11d45491 WHIRLPOOL 5b8ed84befaeb6422e1f6154caf5b928e7fa699d6aea6a32160b60d6d030251fd36f46500b824f8746b39e5cec6b6be42bdfeb01f1a370bae7b85c0f28bc957c
-DIST firefox-bin_x86_64-20.0.1.tar.bz2 25876545 SHA256 14777b93f43a42145ee25f3fafed8dbf455d1c711d9b0d8f91760d9576f0c6ef SHA512 09360fde7c4ce00006518fb2e67cd99f4ecd97a81027ecc9ed3544508402f4bf17bce77b36b064ed383603dd39b8c702733b263e5c3ad008a17eaf72bcbacd95 WHIRLPOOL 90590089b4b4a415937607964d53d3521f779e40de1a24e32701bd8a97cc181a7f641bea2c33649ed3679189310e3fc40dbe693fa92c9ea4c00c3ab487014e9d
-EBUILD firefox-bin-20.0.1-r131.ebuild 3572 SHA256 ad29665b9dfbd3ae666702202bd656e9a57e16813622474a4db0abeffbef8016 SHA512 3f1879a697895f5299a7b26a73f9f8e12b85c8f8d71003731a3856120e77898b28eec38becb46e5362698a38e919948bc0b4061f5a9ce8bd5788fb9a46f7b1fc WHIRLPOOL 48a4714c5aa4d83127cc7aebbbb36693085170830bc68ce95eedf8d04ed6824be52015d3d38e7a726034984b2364386d215dd775f7d3959ced1587dc6fee849e
+AUX local-settings.js 129 SHA256 1ee0688c9b936b7cc92dc445577bccdad3d30a8453c6c7bd391391b00a8b09a7 SHA512 2ae80875251d0ea322acb64370a0077b10f2e2c8bd258cd4792c6cf7152c0a6f8786353167d71fc99607b5f15142af28eb565483a3115b25c2f040c06319ba6c WHIRLPOOL c71ca7760db187726cebc006af3c538b6a41b5802959426d954e8c6d7b151b9d26c95e0bcb30b0c478c704591e6090c9055ef7f9e1a93f1d5e8ce05aec886f8b
+DIST firefox-bin_x86_64-21.0.tar.bz2 27063471 SHA256 769b371b7fedd4e066306de35f263c66a96349908443781689a462685ca81c01 SHA512 003d9395d6db440fd6e94532047bad33203dd9ad563b7cf0889dc30f50aac1d41de5f3d84ad87ddc8c770813e1f3e096dda7c32ce57d7b0e420cd98ac24040f3 WHIRLPOOL dd1ea2abb8e4915c8860f0ade7eb98eb5b5984ba5afe4026b8aadb13468b2561525d026a14848bbbbc65e9471afe404a0c12b894c6422740fa2c96838ca8d027
+EBUILD firefox-bin-21.0-r131.ebuild 4689 SHA256 9bfbbd78c9f756c1edc503ccbd042e90a25dc2c4329d44589e024860e83a4b20 SHA512 aea6de84467f299d871eb28f2f84d74d6f9953218675fe8c3a02031771af25fcc25b7f4ce011703a6e1b623c38d6aa46865344a59be6b69d379b69cb282445db WHIRLPOOL 6995a0a1eeacefbd8a7f2e24ec637c9da4096df44254355c8245a0d95d2e421ec07e136b356d47a8e368fe1dcd4082450697642e60b03ce5eb93958456433152
diff --git a/www-client/firefox-bin/files/all-gentoo.js b/www-client/firefox-bin/files/all-gentoo.js
new file mode 100644
index 0000000..a9b016c
--- /dev/null
+++ b/www-client/firefox-bin/files/all-gentoo.js
@@ -0,0 +1,8 @@
+//
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+
+pref("browser.display.use_system_colors",  true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("intl.locale.matchOS",                true);
diff --git a/www-client/firefox-bin/files/local-settings.js b/www-client/firefox-bin/files/local-settings.js
new file mode 100644
index 0000000..9dac3b0
--- /dev/null
+++ b/www-client/firefox-bin/files/local-settings.js
@@ -0,0 +1,2 @@
+pref("general.config.filename", "all-gentoo.js");
+pref("general.config.obscure_value", 0); // use this to disable the byte-shift
diff --git a/www-client/firefox-bin/firefox-bin-20.0.1-r131.ebuild b/www-client/firefox-bin/firefox-bin-21.0-r131.ebuild
index 7e067e9..ef6b011 100644
--- a/www-client/firefox-bin/firefox-bin-20.0.1-r131.ebuild
+++ b/www-client/firefox-bin/firefox-bin-21.0-r131.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-14.0.1.ebuild,v 1.2 2012/07/19 19:07:18 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-20.0.1.ebuild,v 1.1 2013/04/12 22:42:02 zerochaos Exp $
 
-EAPI="4"
+EAPI="5"
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(en en-US)
+MOZ_LANGS=(en-US)
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
@@ -14,18 +14,20 @@ MOZ_PN="${PN/-bin}"
 MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 # Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
 
 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
 
 DESCRIPTION="Firefox Web Browser"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
 SRC_URI="${SRC_URI}
-	${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
 	"
 HOMEPAGE="http://www.mozilla.com/firefox"
-RESTRICT="strip mirror binchecks"
+RESTRICT="strip mirror"
 
-KEYWORDS="~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="startup-notification"
@@ -39,6 +41,19 @@ RDEPEND="dev-libs/dbus-glib
 
 	>=x11-libs/gtk+-2.2:2
 	>=media-libs/alsa-lib-1.0.16
+
+	!net-libs/libproxy[spidermonkey]
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
 "
 
 S="${WORKDIR}/${MOZ_PN}"
@@ -53,9 +68,25 @@ src_unpack() {
 src_install() {
 	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
 
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	local size sizes icon_path icon name
+	sizes="16 32 48"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}-icon.png
 	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
 
 	# Add StartupNotify=true bug 237317
 	if use startup-notification; then
@@ -68,7 +99,9 @@ src_install() {
 
 	# Fix prefs that make no sense for a system-wide install
 	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/${PN}-prefs.js || die
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}/
+	doins "${FILESDIR}"/all-gentoo.js
 
 	# Install language packs
 	mozlinguas_src_install