Version bump

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 i686

3 files changed, 225 insertions, 2 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index 5505fa17ba51..83063d94a8aa 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.164 2008/09/28 13:16:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.165 2008/10/15 10:13:08 armin76 Exp $
+
+*mozilla-firefox-bin-3.1_beta1 (15 Oct 2008)
+
+  15 Oct 2008; Raúl Porcel <armin76@gentoo.org>
+  +mozilla-firefox-bin-3.1_beta1.ebuild:
+  Version bump
 
   28 Sep 2008; Markus Meier <maekke@gentoo.org>
   mozilla-firefox-bin-2.0.0.17.ebuild:
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index 557167cae482..1c8078531bf8 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -5,6 +5,7 @@ AUX icon/mozilla-firefox-bin.desktop 202 RMD160 2aa2a5777008a86254afc8a754ccc9e7
 DIST firefox-2.0.0.17.tar.gz 9704284 RMD160 a6d1e5ddb1a64e67bb1a0878464402fa54c52650 SHA1 af4e78f5b0e7d2bde96811dab16b3fca52c85a20 SHA256 0fa74a9a7d9d96a5c86958b0b6c09cbd89c7d9094cba327e58f545299e255bce
 DIST firefox-3.0.1.tar.bz2 9094279 RMD160 ea6ad9ccb3c10ced0a6eba96c294135f2d935f3c SHA1 81c985d6405104b9ee91c0303abf13a344f47874 SHA256 76f993e035232aed0c43140761a366cbeba05aea147b3ea4f1c576d75d792038
 DIST firefox-3.0.3.tar.bz2 9088358 RMD160 a99d2ffe4c72c1c7e84c8dff689e17cb04663bed SHA1 351a9f6ca04717e978a4bcce273d21d8718a8e2a SHA256 b96bd20ef5efa00b772dc5e420446b2e24190a1840cdfba6988913350d92dcc6
+DIST firefox-3.1b1.tar.bz2 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST mozilla-firefox-2.0.0.17-af.xpi 148041 RMD160 effa7e229037f04278f72786ba4b65be49d094d4 SHA1 636df214f6222838a5c0224ec24f6b4bc376b651 SHA256 0bf81ed1af06c2e9078f12698b306bd9480e3a858c47f07f83d2d81e2755ec25
 DIST mozilla-firefox-2.0.0.17-ar.xpi 159734 RMD160 01abfc85720be9f0d0c9af4483d7db712ad2efa6 SHA1 446690f2bb7352bf530bf6b77b9df812d1201f4a SHA256 8d4a70628106238a1cfc516f926df202fab5a92cf57102da9a19de9e144451ec
 DIST mozilla-firefox-2.0.0.17-be.xpi 161170 RMD160 7b27e2881afde23d56f2eb2040bf45bf650752ce SHA1 f158d2278f1cfe6a30e88724cb65fbf1258e00eb SHA256 11138b7733c93f790c7cd260f3a2247110fce57e1f1f98b70d721347e68b2a9a
@@ -150,6 +151,41 @@ DIST mozilla-firefox-3.0.3-tr.xpi 116108 RMD160 39d442bc12ba25a52e9e8a170b3f3672
 DIST mozilla-firefox-3.0.3-uk.xpi 134779 RMD160 37e4004fc948f8b04c02aed14966cf6c48eeea0f SHA1 9720891c35eb075f3aa760eda2acaa4c02c33507 SHA256 ea9af92257822bb8467ef6a08a49d8939b23948fa5ecb275f116591c588106d5
 DIST mozilla-firefox-3.0.3-zh-CN.xpi 105878 RMD160 020a6b4ecb94cc7323fe23cfaa48cae862a0f1ac SHA1 33990aea694d451bb2d7e69c1c95e00701374e53 SHA256 71310af6a5a94f03e6a8c5a48f3cee87fa3b89a608b9242a7643a9ac621ada7c
 DIST mozilla-firefox-3.0.3-zh-TW.xpi 119141 RMD160 d9646c735793a758acaf2cb9d1c125e16d7489ec SHA1 aace5d2fa9fe4c5d90cc8c4ab57aca99512949ad SHA256 aaa12832012c061a0881e718256a74c9a236c9cc629d08e8e53587b1bea7dbca
+DIST mozilla-firefox-3.1b1-be.xpi 115067 RMD160 c854a9c188d688c58e49b20cef7b85f698807745 SHA1 849898d17c7c6feba45762ec67ac2ae8b7c163fc SHA256 f18a604c0f7ad916174e285ab948121147545cac00bb94e86c3f4bcde2925c96
+DIST mozilla-firefox-3.1b1-ca.xpi 119083 RMD160 43b15957976bcbb99df5cc1162160d8fd5cdd375 SHA1 e289e7e7f84cda93d3b428988bdfbfd8f6d1a19b SHA256 19a5ab5230a5fc1da5fbbe0259beb562669b419d4887c34a8bffdc16ca90179f
+DIST mozilla-firefox-3.1b1-cs.xpi 117378 RMD160 37bda9d661bd443512ad21004a38a87cee58913b SHA1 fee18dcf0f96b7a08d9ff7fb8fad372cf93bef05 SHA256 e200c2e7f37ab5849e8aabb82cf1d661b2404350563528f40c07059bb0d3dacd
+DIST mozilla-firefox-3.1b1-de.xpi 119733 RMD160 6568e7214b8c3404f1e231da8d58f8b4478b061d SHA1 0ae771d241ade9624373f6573c157e8fc670291f SHA256 84a34b2e6fdaa6ca3e81267af4c23afedb28da10343bc3d3bb0f1a9c2d54e1df
+DIST mozilla-firefox-3.1b1-eo.xpi 114696 RMD160 dfc73d10fc8e0024f57c076640d77ba9085f4b93 SHA1 3d8f428ddcdc1a7061829ea256008d28d6e860da SHA256 e13a75ca89d3499befe5f9706f2fa3bf5769f3a378715c8777960b4f891ab9ff
+DIST mozilla-firefox-3.1b1-es-AR.xpi 118908 RMD160 39683decbb48860ea601e3463a8299c6fe2431c5 SHA1 53860b8b22e8840880e8a42117f379645c9cfc94 SHA256 91da87dee44e3993bee573623a76a308ee629431e10ad35b9955c703b5395d18
+DIST mozilla-firefox-3.1b1-es-ES.xpi 102508 RMD160 5ae011a27bbde03dbf4442f0e36123f5f1bb6a6f SHA1 95c6fa07f00ff6f0fc88c82d3fe6c4e4041dfe6f SHA256 dfc92991beee287ea9b22d877e7cd8a7f680e8a2832554d9db4d04ad30c33d9d
+DIST mozilla-firefox-3.1b1-eu.xpi 113866 RMD160 0b32b52a57320c74e280d5fd61174e7a51d6bb35 SHA1 f74648cc7fbce41b482855530053c9796ede6eb3 SHA256 1f8ef2c44584cf783160d7a6e7cf2cba4ca4ed0a66e2eab15ef160c90128c443
+DIST mozilla-firefox-3.1b1-fi.xpi 117665 RMD160 a4af6f9ee3b068d7da34e07bfc41c16d499a68a8 SHA1 1a65fdd0152cfa83e41b2d164951232b57410de4 SHA256 c9d9671a04e877046e82f46071c80a6431411ab035f7875a769bee99cbd77b30
+DIST mozilla-firefox-3.1b1-fr.xpi 119839 RMD160 db415e862630944d38a203c9abe200f43c529409 SHA1 0c9d0f8092ba613b473ae9605aa2c3d546bf4e28 SHA256 a31f91e758de57bda55a30086766ff3b61c70d3f03b454f81bbde02937b207d6
+DIST mozilla-firefox-3.1b1-fy-NL.xpi 119984 RMD160 cb84911db7932b50a07e437b8e7e016999c74838 SHA1 62a8ed79d8be3517775db72d1cf1f92e01f94032 SHA256 6e9347286f46b3da62948a9bb72ab555b61eea2bdc4960d151104acc1ec4dbbe
+DIST mozilla-firefox-3.1b1-ga-IE.xpi 119136 RMD160 aefbca34f590757beb0ac80ea52aba34bae14105 SHA1 c2abdebb9a572d527466d1bdf6b14d8335dda714 SHA256 0069d33f34780e8995238799ab2563c4c99bfc905ba965c46b34d05076eab3ae
+DIST mozilla-firefox-3.1b1-he.xpi 112978 RMD160 0a9d2c874e8f29abdd130c0bf99a2dc59e9be40b SHA1 7f92928fce0cd3cfa6d56702eccaf14adffd0325 SHA256 94a7263be0cebe636cd339cff15c592d3189eefa3dfc1213b227bd525f3ec530
+DIST mozilla-firefox-3.1b1-hi-IN.xpi 131926 RMD160 2e8dd54b17d742dd3952a38ea34b2d4e5b651e91 SHA1 d6ef09d8c2d9a93d3ab11fd7f02f8538b00cb152 SHA256 78f8779d0b6ed8c84b154da44d9f6f590849eea9ae9f14ba492ff562a7ec0ac1
+DIST mozilla-firefox-3.1b1-hu.xpi 122167 RMD160 8712874eb40f4db6c30934048542d7fd46a85873 SHA1 af5fe9327e777398e8b541e768c571ad94b8a785 SHA256 9132b605b8cc912dd17bf79b27ada4b084b7d66047d6d0e994674577cf0ab83e
+DIST mozilla-firefox-3.1b1-id.xpi 97935 RMD160 9372fa3c2f4c3b296a11fa912b0fbf22908f73b2 SHA1 4a0f59908570409ad132034ca52b17045c4bbf7a SHA256 003539a5040ad4fe1abb9a002e4da055980f93a84f6d0d55623342f683c6be81
+DIST mozilla-firefox-3.1b1-it.xpi 101629 RMD160 793e1d6e4ac974ff7798ebd477f08d9be8d44536 SHA1 8ea38936b936ff056f3f997c4c171eddd4892ba3 SHA256 90f3241425e6935895b9a91a28e6b90fa94e0121f2029f8e2dc0076c1e9edb33
+DIST mozilla-firefox-3.1b1-ja.xpi 126690 RMD160 1a83186de3aae6def6cfe2f276bc1d5a355d2545 SHA1 8071a66bc2f774917c0a41715b28ead4a01aef2c SHA256 cbc035771e7f62dbb372e5fb92954292447864deb7bbbd07194ebb7078648688
+DIST mozilla-firefox-3.1b1-ko.xpi 107059 RMD160 008d8edd8c2b2c269dc1768ac81ee7dd46424da3 SHA1 c05ec3269ab8776ec1a1c4f0e4ccef135e284638 SHA256 160fa2dba00d64bcbfdd33ac98a69f678156e27139f19c27ad3d6b14dfe75ad1
+DIST mozilla-firefox-3.1b1-lt.xpi 129427 RMD160 fa738d107498a70200d371dbce3c321eb905dc67 SHA1 e845aa33117054d286571826a5733502fc053010 SHA256 4ad0230f969dfd8ba04e154a1151c6c02156a6add7a68461363ccc8c6aada9de
+DIST mozilla-firefox-3.1b1-nb-NO.xpi 115622 RMD160 67f346ba92cccb179098a6f1e14c9ad27c5da3ad SHA1 fcf96a85f95e284a08364a0acde66c9ee30c5fef SHA256 911fb4846b241d7b735f4adc2f52f8ef747ec7dc83429693f7100a5c063df4a2
+DIST mozilla-firefox-3.1b1-nl.xpi 117818 RMD160 7d6378b3e62f50ea3b5df87891673d23292bd20d SHA1 fd7211e55e2ddff19dec1ec1d201d2343f16ba0a SHA256 6596b100d4987166026a193e0e650a3bfedbfca55f9ea530efebad8acb17d9e6
+DIST mozilla-firefox-3.1b1-nn-NO.xpi 117091 RMD160 bef733b4473fbde6d9944289764c578f2660e534 SHA1 5bccac3c9517d97823413f09de06e2ae6c2e7b39 SHA256 2a9335f4cba43a44bc2bea539ab9716a867815e1f925586b5f898c4853886627
+DIST mozilla-firefox-3.1b1-pa-IN.xpi 132385 RMD160 21dace7970775dcf13f08170a09198165340e45b SHA1 530143002841bc1d54ecf68b7b6fac25ebae36fd SHA256 720d0bfad34ac5db0b1065d83fc3f5fddd5192d00118428f448b7c74000d43a7
+DIST mozilla-firefox-3.1b1-pl.xpi 121345 RMD160 8d532b1068b2fe0bed40cb311cdc5f7004e80649 SHA1 0a1bf16a2cf2332f8ce1459693537330c828b25a SHA256 5d66d2d1053a9924f390d6e83b564a678e5cfa42bbaee6dea545f41babd14afb
+DIST mozilla-firefox-3.1b1-pt-BR.xpi 116434 RMD160 356eaf3cc5aaf41673aea930557e6678f05119ab SHA1 9e22df933942327d6ff63766f93a4ff7485d076c SHA256 cd950b8811437482fdd6dafcd05feff3cd42d8390d7d25d4fd8ea5bf0d31b19d
+DIST mozilla-firefox-3.1b1-pt-PT.xpi 116149 RMD160 bcee328118a259f929207d7ea6d52e1fd8696367 SHA1 15112618d6919911ce36150b099c930229759c87 SHA256 5d1ea087fe1cc8f7626486f9e570c4482bca2349258e39bca0ffb9df7e718caa
+DIST mozilla-firefox-3.1b1-ro.xpi 120087 RMD160 d898eec46a9692df5f5fd257f1ad60aba28e018b SHA1 b10b551aa9f58c29811c7d022e4656d6fb4e38f5 SHA256 8e441ebc514d5cca8c8ab28eb93e20aff39da24d89bfdadcdead2b2d23efb7ea
+DIST mozilla-firefox-3.1b1-ru.xpi 117395 RMD160 05528764d7cfeed67550b4628899be108715489d SHA1 8149bc707ec74a3da8b4724d83b53216cea2381a SHA256 e2e2b8a995588e08356e4c6eee178ef037c5f4b13018dbfa15c10203b037b367
+DIST mozilla-firefox-3.1b1-si.xpi 131455 RMD160 4219b8ae404a95110b70e9f81217312638c21e31 SHA1 95d45704250bff47066fd6af9eeaf3f6317b62cc SHA256 532488bb107a9904ba462eb381538f60c37b7046ed99c324862d31ddb9ec571c
+DIST mozilla-firefox-3.1b1-sk.xpi 121241 RMD160 1f1fb0b64f5e89009814bb74ab994a7d6d99679a SHA1 dce8eb9b4403e158a8408081c79fd4b2177ca554 SHA256 117599231b9f65c63f46b6a00ed019a7d34762012b5a5c6274b66ace89eb3c0d
+DIST mozilla-firefox-3.1b1-sv-SE.xpi 119669 RMD160 89dba8ab10c807c95fd0b3020a5b02601403b3ef SHA1 b676dfff95a5e19d78c54648017fb3702055eed2 SHA256 10a2501fa9d374ab16ccea5c087506dc364320ebbd1b5d5c4bec779f9d4d2357
+DIST mozilla-firefox-3.1b1-uk.xpi 129872 RMD160 2b50db700a6fcf30b5cc0c3fb912f66dce51c373 SHA1 28d6891e0a795ccda995ab5f4ded24c6c0e7742b SHA256 1142963b98ea4da5a4fe982f13e316c8902fdc3889f94e7396dbde155bf46835
+DIST mozilla-firefox-3.1b1-zh-CN.xpi 101382 RMD160 ca9a99b87f4347b333039febeae056a24155abff SHA1 561b9027aff82adfc7b992e8a86fafe084a96918 SHA256 a84829c20ff0662de010e2faa7ac519aeb4d26a6600cfe07080c7bf5b6d69d5b
+DIST mozilla-firefox-3.1b1-zh-TW.xpi 119538 RMD160 0549a8800ce40badd8089e312b865e62eb751e43 SHA1 38fffd890c0e6e18c06bc07687b5ef4b29a15c04 SHA256 f4b19ccbd6e9cd68aade10d30bc76b40441c30a2bf73b03210921d3f6cc9cd7d
 DIST shiretoko-alpha1.tar.bz2 9032699 RMD160 314f03231d58b0930b00555399c76aec39a3a610 SHA1 256e04d81176a43258c29e6c3082604a8748a8da SHA256 c355c0329e234ef6d4c90ec84d4c895af7529ba54fa96a55d071dec196771e9b
 DIST shiretoko-alpha2.tar.bz2 9272952 RMD160 0352ea76fa049894dc5b937eee3a2104bf7fea64 SHA1 20f610dfcfb69c787b855c9bef9eaf68b3be6028 SHA256 0132e7d77f81e59027725c5582bc8efb7dfe99cf757a2819b8af9e4581c9ae9c
 EBUILD mozilla-firefox-bin-2.0.0.17.ebuild 4701 RMD160 9d73bd641b1699e687ce03744b6d05e16cd8b0b2 SHA1 e96099ca2237301eb67f4e43d2eb5db121f9fed6 SHA256 51508554192191dc30de4c1282d2688c8ce3eb4001f38000e681adc23fe70970
@@ -157,5 +193,6 @@ EBUILD mozilla-firefox-bin-3.0.1-r1.ebuild 5019 RMD160 7d6dcfbe9d9520d26ac90221d
 EBUILD mozilla-firefox-bin-3.0.3.ebuild 5043 RMD160 37956c981a53260b1ffce545a831773a7ac4d26a SHA1 cd96ba698397ad19f04f436be127dfdf364a2845 SHA256 31c78ff1cd5674d67a3ee364ee3b6291a14483ab69512506a79de95444cd194e
 EBUILD mozilla-firefox-bin-3.1_alpha1.ebuild 5088 RMD160 19a755bd615e99095d95faec1180dffc497f3798 SHA1 0116fe4c466a93b9864cb7290f4b2b60e90cecf1 SHA256 b05a8a3c809b7759182fa6ef15262e37d7a6c78c6080d53907036cec6d9917d6
 EBUILD mozilla-firefox-bin-3.1_alpha2.ebuild 5171 RMD160 4044f78faeab8c9b448585ebd8ce8f17a4589ce9 SHA1 ec2df5e2912a0d9ca2841961fb3a21055537f91d SHA256 887a0f85c6244ed269a5e422cbaf1c8a9cdf2d5bf3c47bbdaad8040aff801a03
-MISC ChangeLog 31327 RMD160 40c95ab4c4fce3b2ce0c1b47e8d7ff6a81648253 SHA1 4bbf3b78dd87948ee2e872b3bbd7b0b1f67fa7fa SHA256 70ca6efc78703a9c83df40476e520f0095f894a835534cd6058defa1fef27dc8
+EBUILD mozilla-firefox-bin-3.1_beta1.ebuild 5130 RMD160 151a4fe427f456c2f16b0e6665184d6c818989c6 SHA1 d9c3fac5d9af9da8a25dcdb653573122fbaea52e SHA256 b21df54309ac5db13f3ecc3927e45e0adf92e330cec9cd8d81c6063b87c9526a
+MISC ChangeLog 31480 RMD160 5c1a05b0b7376388972dfff7ec32b92cb154f8fc SHA1 ee09ec6bb56d855f0020b602c7ce39a478d2297d SHA256 538d902f848598679bf1eee2ddc49c91f447ee681cacc52ea1f47d9295f56391
 MISC metadata.xml 361 RMD160 875569d22de792136757a0f5885f7fdd11b40691 SHA1 ef5fecfad87eceaeb1b4af3bbfa4bacebf714277 SHA256 adcb3648206e341af38e084574e9e4851e4e51ffa7356bbeaf205e3e16553d3b
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_beta1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_beta1.ebuild
new file mode 100644
index 000000000000..6a48381d5240
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.1_beta1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2008 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-3.1_beta1.ebuild,v 1.1 2008/10/15 10:13:08 armin76 Exp $
+
+inherit eutils mozilla-launcher multilib mozextension
+
+LANGS="be ca cs de eo en-US es-AR es-ES eu fi fr fy-NL ga-IE he hi-IN hu id it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sv-SE uk zh-CN zh-TW"
+NOSHORTLANGS="es-AR pt-BR zh-CN"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/linux-i686/en-US/firefox-${MY_PV}.tar.bz2"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="restrict-javascript"
+
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( http://dev.gentoo.org/~armin76/dist/${MY_P/-bin}-xpi/${MY_P/-bin/}-${X}.xpi )"
+	fi
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		if [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( http://dev.gentoo.org/~armin76/dist/${MY_P/-bin}-xpi/${MY_P/-bin/}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+DEPEND="app-arch/unzip"
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	x86? (
+		>=x11-libs/gtk+-2.2
+		>=media-libs/alsa-lib-1.0.16
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-1.0
+		>=app-emulation/emul-linux-x86-gtklibs-1.0
+		>=app-emulation/emul-linux-x86-soundlibs-20080418
+		app-emulation/emul-linux-x86-compat
+	)"
+
+PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+
+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"
+}
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack firefox-${MY_PV}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${MY_P/-bin/}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P/-bin/}-${X}"
+	done
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js || \
+			die "sed failed to change locale"
+	fi
+
+		# Create /usr/bin/firefox-bin
+		dodir /usr/bin/
+		cat <<EOF >"${D}"/usr/bin/firefox-bin
+#!/bin/sh
+unset LD_PRELOAD
+exec /opt/firefox/firefox "\$@"
+EOF
+		fperms 0755 /usr/bin/firefox-bin
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10firefox-bin
+
+	# install ldpath env.d
+	doenvd "${FILESDIR}"/71firefox-bin
+
+	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
+	dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins
+}
+
+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 x86; then
+		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
+		if has_version 'net-misc/curl' && built_with_use --missing \
+			true '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
+	else
+		einfo
+		einfo "NB: You just installed a 32-bit firefox"
+		einfo
+		einfo "Crashreporter won't work on amd64"
+		einfo
+	fi
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}