after discussing with maintainer here is my attempt at a fix for bug 465130, hope everyone likes it

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 181 insertions, 15 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 1dfc29727b93..6ae887231a73 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.148 2013/04/09 16:07:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.149 2013/04/09 16:16:35 zerochaos Exp $
+
+*firefox-bin-20.0-r2 (09 Apr 2013)
+
+  09 Apr 2013; Rick Farina <zerochaos@gentoo.org> +firefox-bin-20.0-r2.ebuild:
+  after discussing with maintainer here is my attempt at a fix for bug 465130,
+  hope everyone likes it
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> firefox-bin-17.0.5-r1.ebuild:
   Stable for x86, wrt bug #464226
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index cf037b9c8f4a..1f7d1c026951 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1050,22 +1050,23 @@ EBUILD firefox-bin-17.0.5-r1.ebuild 4355 SHA256 00e63591c8842d22e575320c64e9150c
 EBUILD firefox-bin-18.0.2.ebuild 4179 SHA256 220454bc8148807baf20a8b070d9c28038e4d6234a479552cdae74c5fd1bf63b SHA512 e3c4afc1c57ec86e45b39375e216aed1b5634c9c9d7c8f2236d381d6a40d6b8e5f57db93aa214683cd0db2a16ec3cef32d0c6678779015f64a8d624fd9377bec WHIRLPOOL f2cb1dce06d9fb29132d2ec8b786d7abec7eef18abc85a338ade9fb5edd47eeb8688989d05c168227db27f9ce43d851204aeef1d6ba7a8410b937cca7ddf41c7
 EBUILD firefox-bin-19.0.2.ebuild 4176 SHA256 bb8aeb2ce068c9a8610ac1fe5344ae6506ddc1484da3124f53df91f7b590eb3e SHA512 175709c8b3cb3539fa64ba92f858ef9f90ae680cdc2a14f046734079762da63fe075a92a72658f3e7506918e8398d947690bc1a2037908ffbbf823eb960ee59a WHIRLPOOL 2a697c731325b137fbda794e81c66dd33bb39cdc40f429574a45fe9144a24431d1649fa897d2a8cd7a99916eed33d68b1e4713c2b6392d2393efbb7691a92920
 EBUILD firefox-bin-20.0-r1.ebuild 4243 SHA256 cfc48fd63b61ea90ec9baf7f093b6818fa794cdafee589488ed7c82d4567d9cc SHA512 9ba6825e680504c39dd34b2607e76be28637225dcdec4d2f46f4fec613395c2acc813eb431ccbceeb9e0aed585871ebc5fde1d490f92931f2fefa520461a87dc WHIRLPOOL a0ecf2c36dc191b9abf83ed94cdae91d6e0bb5cae6e7d0ddecddd18062e7032a04466360da57d83d642b3285ef637b19f8f64107bbf28583c4965efb9386e881
-MISC ChangeLog 62150 SHA256 45330f863cda2b6c5d9811c2390527e871a2409d67c9e2d1279e2f483313ee61 SHA512 3b22e5f36222f7f35103b39f4ec50ae9fef7b53434e7063366b22346d765969d25765811428cf49a19259d94064d39d6cf3a2f9bc2311ff680fc05ef39e30419 WHIRLPOOL f7b8a46e3529d3b3bb78e7d0abf693eab0a05c86738715ba7b3d20d324f208e30eef2b919a99cb347e3dfb36a48677ae58cf7e0136c86c64a352c1cc9b84af0d
+EBUILD firefox-bin-20.0-r2.ebuild 4871 SHA256 e440098eb5b76a2779b9e14539106f4c4471fc1108e5bca48e83bd22f71ad977 SHA512 b6df3a69b5c24856ac79b7e450387673fec9fb8a980c46ac06c79c6d774f0c2695fd39c75678b753c70f537bf1816769e98d35aa1707d6eddf036af9d702d9c1 WHIRLPOOL 2eb4770a7e399c22c97499b9ed54f62f412c6c8d224693719121baf05474343b8ad3e636828cbe298e2437ddbe54a383d1bf76730dc4fd0feb790f4e9f1f6d98
+MISC ChangeLog 62376 SHA256 34e8672e145a23809200850eabc76c01cb15a0efd36c93d0b647303b85eebb8b SHA512 1a605b43fdb22cfd1531ac99030f44c37a639b38d2015f86619fc318dded90fc116f0ca5332cfdba054852687789d8d8099bd631e5060ee8a8784686e850e9c4 WHIRLPOOL 31f9bfd5f3e2c510d0b171bdaefab8c07c0d5a0b73b0eaa54718ad5e6e35d44e783481e196c686791c70d4c71a11ca5e4ff2fdd095747d3d36e749da2f3ea412
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZDysAAoJELp701BxlEWfcMEQAMTzTl2CiEHRFDATl15EIIeg
-g/dSHZT2gL5qhJlyGStYt+ZOLe2Oht2y58h0aHA1eD7oVjLAPzGfqjYd0ux03qzw
-usy5xqW04Id+iKk1NeD2p1ezuHH6L38J9X0O6UF64OVyUhblJA7upKHXEHKmU20T
-B0fa/XwtBwLMbantIipJ4hzu9nMLw6ChloCjj64BM2cl0cKWqgnzsaCwhGnv4tGH
-JeBzjh7uCJSSgckNAw3Eos0Kg5vx7s2/B9PlnsN4Zt0E4htqtc4//KhE+n5NpN7B
-d5l3s+BIpgX8QhBLnFb9qRthu5+58cz1cK+bVwCKECVQZ4hiuQs0k8jasjHGzNWN
-R+89EyclU5HTsm7eXAyiJZ/BeMU1e7CXOyn72yBqsJhuXy9GF8Bda8mkDHBEVCl6
-Dq2fxpco7FwaxvdmBqBvKCUdAIs2JDnbx+FznGnxjkHUF/hHarO14OYDB3il8Dvn
-83neZ3kfTGc88LQ/G0X5YNaVNFxZU6NamNQ4OO2LdYZ4he3GD7W/wJKFUK8F27YR
-Oytcz65FtqAebNUcuAM2DWqxqWPvgC4E6u3m0MvsSqIX25483y68XSElWU1tkuh+
-TMZBsQkK3TV4DZzwvIwRmmOSG3AYrUCH2W/TS/y0GPkxHHub5KJ8fWChV+x3X9+5
-hJYNDXS2XfJHRqbmcsIL
-=082p
+iQIcBAEBCgAGBQJRZD9xAAoJEKXdFCfdEflKjM0P/0B0X3zgxHbXEuQld/45sW7L
+KXch1E25evt2FvicTlPNeGs0iFyBGlzSeXWr5clFzyWIIRZ5JBxWyN7ABD70U7U3
+X5DywyFz4J76wkzDyjoZKBMJiwphASOhdx92TcBekR5uaURdISEk6ajU5yvDTTAH
+Mc9BgC0rZtjxtCtEz84GSzi39Tu43AVxX7x9EOK2x38CP3HlhU4R07EfhwJyxi9L
+Dk96qC0STecWDEP4av5ggYshJUJR0rAvYjT/v9vV6scWujTHPmgoiA6lNbHPPE5w
+5Yv25d6LW9lkSfL8ydiRv3y26/aZJ/RyUKLbK7etXWoJxuOm8bJyDXJN1ClDBLzY
+wxW0rtzY2DlSEBjEdVFSpuQ+UIyOrzp/ljsEQ5XB6GnX6JXHrTKJX3OaJmQzMLBp
+lks/WfvTNztlXD+pa2BVaoQNglMae2pYHjncv1jw6CBNOVo1e0ELOzH9cJUtvFN1
+u79w/M4cg5Oy9vSWx6rbufrD9r0SGD6lwyE5zMQtJ29YBEj/Ks/HjG9Kz2SiwtXu
+N1XIu4rPRFF6aSCn21oc9VgCuCzdzDpNDIA1bB1Gbl2U/FaPmVAusp3Uqa8X8VQV
+3PkWWsdcXjlvSFaMaui5ObkvAKKIlcza6J4JONxjl1ACDChT/3GsMQi4OqGSUKa4
+v0ugEV+sY1gUD0oO1Vw9
+=/vaq
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox-bin/firefox-bin-20.0-r2.ebuild b/www-client/firefox-bin/firefox-bin-20.0-r2.ebuild
new file mode 100644
index 000000000000..3c1fa3bdcc5e
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-20.0-r2.ebuild
@@ -0,0 +1,159 @@
+# 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-20.0-r2.ebuild,v 1.1 2013/04/09 16:16:35 zerochaos Exp $
+
+EAPI="4"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
+nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
+te th tr uk vi zh-CN zh-TW zu)
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+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}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror binchecks"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/dbus-glib
+	virtual/freedesktop-icon-theme
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+
+	>=x11-libs/gtk+-2.2:2
+	>=media-libs/alsa-lib-1.0.16
+
+	!net-libs/libproxy[spidermonkey]
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48"
+	icon_path="${S}/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}"/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
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}/
+	doins "${FILESDIR}"/all-gentoo.js
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
+			>> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	cat <<-EOF >"${D}"/usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="/opt/firefox/"
+	GTK_PATH=/usr/lib/gtk-2.0/
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	# Plugins dir
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}