Version bump. Minor 2.1 ebuild adjustments

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

6 files changed, 391 insertions, 21 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 7fc6241bf3a0..0687823c8c9e 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.317 2011/07/05 19:29:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.318 2011/07/08 16:37:14 polynomial-c Exp $
+
+*seamonkey-2.2 (08 Jul 2011)
+
+  08 Jul 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch,
+  seamonkey-2.1.ebuild, +seamonkey-2.2.ebuild, metadata.xml:
+  Version bump. Minor 2.1 ebuild adjustments.
 
   05 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.1.ebuild:
   Fixed sqlite dependency. Thanks to jojo170387 for reporting this in bug
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 2037abba3c08..d00d7200e8c5 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -4,6 +4,7 @@ Hash: SHA512
 AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b
 AUX enigmail/70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
 AUX enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch 508 RMD160 54052743ab45504b96a7489ce296ae1cad24b4e4 SHA1 635dbca4f0b64491c4d9eb648bb673b0074caa96 SHA256 914633dca68d383d2d85cbba8b24973ee0c9f89e71eb79d3e7ee0a15aa168b3a
+AUX enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch 392 RMD160 77802eeb8849aa996ce6c27fc6f32ab7b55f8744 SHA1 cc7a8758e4efdd8556a2c8e2812de89fceaa3242 SHA256 37cca51c4f7b05644576ee758c1fa34e36708e4117520f5744f8b94e719d5cf7
 AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 AUX seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 744 RMD160 7c9bab23159e956813fa2e2a59dac5dbc16dbe60 SHA1 d29a9ded0cad3df137539642e6a6031c361c47ac SHA256 a8b217e3bf7902caab447f849712459f92e19c8889bc66c977019c603ddb99d4
@@ -58,24 +59,47 @@ DIST seamonkey-2.1-sk.xpi 843122 RMD160 27cc8e0c31c6b8eef6081b57b014d44a7c9effc2
 DIST seamonkey-2.1-sv-SE.xpi 872350 RMD160 1ffa72e913b5d51772ef612fa65792bcec3dd617 SHA1 8bb75b30403e27080d8b8bd26eff012c041b5727 SHA256 eac3f84d9317bb966e97fed494319c63cb8f21c772d9fe4eb6eaf65903e5c2a2
 DIST seamonkey-2.1-tr.xpi 807997 RMD160 5f1c772a6bc14fb2f731c9b36657a3466ae00cbc SHA1 f95b48c73570300cd8c2e3fa41430f67d50cb1f0 SHA256 7e9d6c436d67000b7ac66607a9b5cef3755c36d41eb1175b026d7ec1bdd518e4
 DIST seamonkey-2.1.source.tar.bz2 84304638 RMD160 0802145f3f77649e40e9c96d5c29d4326ee550d0 SHA1 8d48aaf5ff3a5e88bf8c93b8414776a085f370d5 SHA256 1eff4a7d5dab6e709145a7d88e60b879d053cbead38d013a37e115d383eac2d6
+DIST seamonkey-2.2-ca.xpi 811514 RMD160 536d03149cbc7cf45f2ac8cc1d257d20c15e2aac SHA1 67dbcfd74c047775bd49a29326f999bdfb3b7812 SHA256 433a6e1dea81a1dbe9fc5f0e360845affb71dec9e3c5a669cc355281f17d70d9
+DIST seamonkey-2.2-cs.xpi 814944 RMD160 6e463e66d13039662d752946ad69c7757d0d12a8 SHA1 fde34a7027cd285b687e70e195b7f2cfefe20d3b SHA256 666d504cf2d216a7a8de8a13898719da89a42166e4ee1d4c2d2bfcb4c9e39b6e
+DIST seamonkey-2.2-de.xpi 857283 RMD160 96f4e5fee9f10dc6a53aea75b619b8924fe5481d SHA1 2feb7d3d6bdbe522b1eb8481beabd4bca2e3cfe5 SHA256 13c3f08bcda947e5c20111a73bee995d5ac8bd97defd8ad235530b61d75de72a
+DIST seamonkey-2.2-en-GB.xpi 787529 RMD160 3d92ca59d04ffb6511b92740e61fbb4da7054398 SHA1 ca5df2d1af5573be18b1bb2ea80bc1582cab2053 SHA256 8133dc83554f01712330682c2b269ccb2917ee3064ef7394ef9f82db26845932
+DIST seamonkey-2.2-en-US.xpi 786992 RMD160 20d6f3ebc1e147ad0a6180340b5adcc1837f473b SHA1 2bb1d54e0f01ff0c77e00681852036ffff24e905 SHA256 8ac1ce65dc5044deabd9e1b49234f448cff3435b0660e42e091ddb611d219cda
+DIST seamonkey-2.2-es-AR.xpi 813118 RMD160 b5210c2007cb23c75530199851eb32d3e7ccad40 SHA1 99f7257e61074993ad3a4e4985a4d84d954de932 SHA256 4db1673c306b821dca7de124415b4b92c339a076bc7cd38892ae06927659c982
+DIST seamonkey-2.2-es-ES.xpi 785711 RMD160 9ff7c20c4fcacc3827705e97e0ae6258016643f4 SHA1 2d9dd8f11f090db8844c32fb5fcbe22f43b318b3 SHA256 08158721a1122ad6a74f688792e5f7e6e33ce078e1118dd8f13386da6eda6bd9
+DIST seamonkey-2.2-fi.xpi 807217 RMD160 a5b9ac0fd9848a0edabb1de7b38e603ade71748d SHA1 927a25e2a00bcc5695f8b9d4f5060591159ff9fd SHA256 a1350aa978c30a71f5ea2a7983bf2bb3f27ad46ad2572d355b565664ebe66804
+DIST seamonkey-2.2-fr.xpi 896104 RMD160 3f09cfe68e9eeb8a23e98f283083d88b91c6e357 SHA1 ed977e2259f6c636aa0abbdee6a509ba2a4e0a8f SHA256 fcac0a2c51cf193fa2c712670a6c73e94ed58588ddd8dc0ad3e708b777f81842
+DIST seamonkey-2.2-it.xpi 739672 RMD160 9326e8d3a3cc35eacc52e77017ac27ad707fad34 SHA1 84bd25883ae5086d78f2369683e71dbf67492db9 SHA256 28e7b90ff8d7596d7fca6c253d8fd2b1fc9464217cb7fe1a86a4ae9b832a1f8c
+DIST seamonkey-2.2-ja.xpi 861377 RMD160 5a1df629cd853320510605f56058c3f08ccc4929 SHA1 8fe82f5b3a82eb2155f5ec044679dfd0ee437b26 SHA256 ad3d03f42747427c3c862a6a30cb4b513a66fb21a8fee778cc56f3f3a013761e
+DIST seamonkey-2.2-lt.xpi 959540 RMD160 1a136db87ec7752222e320ed0a91f6c0e6b58c30 SHA1 883c876ba23386ac6e7a720a60904495a13820f3 SHA256 d129bc0278ca8637df4fe377c29ffcc687d2d20b4de35b7144d83508bfeb6713
+DIST seamonkey-2.2-nb-NO.xpi 805675 RMD160 83cbcb130fbf72f22909a126f3527dc9a8ff3bc9 SHA1 c23862b8a05a1fff0cb6cb6611d770e248c6fe9b SHA256 15818961fa34bc4610fcce26f8bd8885495f030d2ddf5d3f05fa0ee69aafbf96
+DIST seamonkey-2.2-nl.xpi 804311 RMD160 d8b6296b165c1827716ee32013e3d5d8487a0647 SHA1 329db24cabe1dd4151e7005fb0c501500deec301 SHA256 34385a5ae09d976b7124366cea2304ce6b4489119c337b175fb9340529324a76
+DIST seamonkey-2.2-patches-01.tar.xz 17864 RMD160 56de5f2e7647528f624c13740a7e09b290f98324 SHA1 f53ef1e0521bd44fee3b6ce5beb3af8350110aaf SHA256 22a6826d569aa9b716fe1ffab8dc260323659d9e12e2a8681b269343bc8a2b11
+DIST seamonkey-2.2-pl.xpi 825438 RMD160 5ae746d41576afb70adf539a8356868ee6f250da SHA1 358c82dc6b23825ccf6f06fb67ac54f5106cbb03 SHA256 44e0e2883601f7a71c64e8fad1e5653904dab5f25834cc96b479f7d3efa73f01
+DIST seamonkey-2.2-pt-PT.xpi 842511 RMD160 f9f0e59d2945aa53d658cd70205571f805a0de3c SHA1 a7617a5919480ccdeb60ad8d276fe9ef22f53e44 SHA256 d733234dc5b11ea32b611d54efefea31eea331d21555db91712f9810d1f2493c
+DIST seamonkey-2.2-ru.xpi 889516 RMD160 6c52b0e08fdf1f453a66e1e5de24bee5692aa303 SHA1 8c4b87271e3c69315f769818156fc72d72088db3 SHA256 15700e56b4ead24fb08c8a65b615343a56f364dee311dc5e808f1055c9277c5a
+DIST seamonkey-2.2-sk.xpi 840212 RMD160 24f53c0ab9bcd792b36782b84da70be42679fef0 SHA1 93d37565c1940fb6f003712a37bf8a07ba26d456 SHA256 a25e78e2c9e682910bd6fcdc7639ac7902d07f99ac9ccb85e567bb28606dcfcd
+DIST seamonkey-2.2-sv-SE.xpi 869508 RMD160 592963815c37201e54594a9dc1c103fad147d743 SHA1 73dc9b6b6a277687712db523f26d7bc697e0cb6f SHA256 83b5e7572ed550e299b2813a0826d3760e18fd49b56a3e852f3be32cd133a1fc
+DIST seamonkey-2.2-tr.xpi 805151 RMD160 5accabd955766af2f6a95ec6a162fe7e9fc50790 SHA1 313cdb5c013f09e5931fc32ff84308b08b710c8f SHA256 0bb342f7845493c35f743b3f8589e9fa0d7ed1c283f400eeb929617c13f26f56
+DIST seamonkey-2.2.source.tar.bz2 87478968 RMD160 cfad0460357c357df7a5936c0bd10374c18eac04 SHA1 bb2181fbbb4aa16e51899b483acadb31f7e0cbbc SHA256 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a
 EBUILD seamonkey-2.0.14-r1.ebuild 10004 RMD160 b2c7c104521879191e20e96949ad5c7f099e6f27 SHA1 4526a824c43500f4949c509914df49bb0a177840 SHA256 ed952957062934a3f564506a6fc73858147597f84be95b9e9c52f358fb8d00e8
-EBUILD seamonkey-2.1.ebuild 8753 RMD160 052d052776662cc8780df18c52d5c6196079da87 SHA1 9b0f72421444ed41b70a52db8f9c2eb71dfc4b53 SHA256 4a62deccd78699620639518280d2cbfefee39f69e206d90e6a2615d2d641a5a2
-MISC ChangeLog 41565 RMD160 16e7d65258f875cc8a642ea08c5dceb6cc3a0e87 SHA1 fe75187462ca27517301975a9a2ce6ecb6bc57c0 SHA256 bb03095f8998283dddcfd2ccc6a23b7efb128768ee076e549ab3b92649c47a72
-MISC metadata.xml 1017 RMD160 bea46bd4a1d4abb1d1c9098ebad64109f7f81fd4 SHA1 53b2a8edcdf9b0ed3c930aec0bdc8e619c9ecbf2 SHA256 d32c52555a6e2a2d1d9acf1284919dec37082b1a0fbf6933fad47a507fd73f6f
+EBUILD seamonkey-2.1.ebuild 8652 RMD160 f2b30f546157d680e2e4bb691c1ec97b64d42189 SHA1 063c964ff1a2265eb82621acbbe9feb69b790d8f SHA256 e25b921dc2bf1728f835573a3d237c11de5f83e9c393c564c50ab00785e6ef09
+EBUILD seamonkey-2.2.ebuild 9287 RMD160 51b300a995bcd906fdb469b76f52b1f575b37c96 SHA1 28fbdf207b7a04b91c61d47e452504996cb8d3e9 SHA256 9623ad612f02f64cbaf7ffebd1bd68a0dc325663a85ce6a06895c0b9f3d3ba74
+MISC ChangeLog 41820 RMD160 ef804c2c1fa4e21d77cea3e9ea657bcfa68f2e2d SHA1 aafd0a71fea3afda61025acf822358b0ac11a9df SHA256 8213881147c4b061fb43f7dca1fc8b2989152578420d3f30bdb32c4c35a3bfe0
+MISC metadata.xml 1201 RMD160 db4a19472bbc6e9586bdebc804c1845e4a9cf062 SHA1 cdd2acd56566f2014682735db36922d7660afd12 SHA256 a8ad3bb4d1d4643e9ad5f280b46016801d7da73e5d319870e3d91ef780825208
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOE2Y6AAoJEPiazRVxLXTFuFEQAMg6RR7wyPq7SrOUdrSi4bKw
-0CifvmZwYHnFaeCgO8WbSlwm1tbVCHuFwwW/qFTznPZfDI+WvLpKc8orR1zchxoh
-9lxPHzB4On3uXgQ+RK04PcHXl3i3y1H3zmwjTrWYeRcyYQstE9ZnjIyNyzy/orEh
-YY05GxfeZvBNIB7JesJd7szLmq44W8wbkdahkb4dpxJccBYDZ2aIDx13N1T9vu8X
-+ZGTN1JxkbJgCmrNd5xoUXN55v3K6m8Cdk+sVOXPFmvZTI3aeQluA+esCUHh7unn
-LsOIwlc9jg1LN2BItLZ/08dV7zk7n9Encbtg9pDjv8pTPi6A1TsWAdvmE0ItDPkk
-xVPiG2tC6fBnLnTqezmYDXEEiHK8iPgx5dyncsXx1RXnQS3TAkcbFjTSdXdZr96a
-GRC450kXW4M9/aJn5Dm9VRc7lSIukzAqOaBDm/iLsLtY5ec9d83IOK1Al37f3I2G
-KpTSKQMy3kT315iQKOvGzQOX0FHT//euf+XZBegSIeTZQbOjSgKRax3AoHMZwGhE
-IsBQ+WRyKwwyce/xSMfQWUB36x9JrooViFNNtA51BjQbbV6tWaPT+QoBEdx5FLuT
-NzoZR6/xUcI1M9gQCYSXfIfQSAVIWdLUyjU++eHlzdP1UNI1nPcXzRlrkDRVW+5r
-CFxyIjUvp95MEcKbq6V4
-=pvbe
+iQIcBAEBCgAGBQJOFzJBAAoJEPiazRVxLXTF7GsP/22b6weqA1okSKN3TyUGn2rH
+11oufuvl7+Ij+3FrsdZ747tYSl7OZNnopfZw61JlCdmc/P+xk0yQ6VlG8a8svY5P
+1V2d7n8zSjAEpCs6iPhUTL701Xh+3l/JACYjeLlOpjOS8p6DzMPwUXVdHa9Qa2vd
+KiysZvEurXklrrW9ZuYUOXuJJD7XsBKFjCkPsgP3oivUykipF25eDOCk9i9QTKiB
+2ADCQO4VEWaSU/5efka0Igcqlnp/4+PZ6zD3yZfM/ebj6KYfBbFcB+54T/vaqyOz
+r9cveJI2YiUzeS5E4VkYnujvlKVhX/TPGtCiy5kVoMdhYvCXkZ/KamQKCEyl2zLP
+P1Bn14/QlTGoWPkMC8ClSU7pNAJMN6Hf5dQ0E7CCa5Hy30EvyIv0pWN4KW5IQn3B
+qrTAeNdKfFCYFOl4vVEkYxhS23+EoIQIQc5ZoojCM2KhghsW9NV+ApNnjXBlvNtl
+b+t2fvjfZq2ISbwwSpgK2zui+sKhr1DiBoOgsIFdlE1v1yQCeqw5wOTLCCkkunKP
+DcGMZ7lbGBBPHDc1GI+VhgNb+VEoO99CYeYt91OR3fr9h2lhUomAS+uWrSRA0ilx
+8cgur8F8apcu6DEPoBMxR0yGg+NhjqkjcMRW7glotxXStGkGiKcZppA/coL9N06T
+NYaCOLGiA+BbB/NyB/ob
+=rWsi
 -----END PGP SIGNATURE-----
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
new file mode 100644
index 000000000000..91524aa9146a
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
@@ -0,0 +1,11 @@
+--- enigmail/package/install.rdf
++++ enigmail/package/install.rdf
+@@ -24,7 +24,7 @@
+       <Description>
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+         <em:minVersion>2.1a1pre</em:minVersion>
+-        <em:maxVersion>2.1.*</em:maxVersion>
++        <em:maxVersion>2.2.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <!-- em:targetApplication>
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index 159770e33259..735e11adb723 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -14,6 +14,9 @@
 	<flag name="gconf">Add support for setting of default browser using
 		<pkg>gnome-base/gconf</pkg>. Useful only for GNOME 2 users.</flag>
 	<flag name='mailclient'>Build Mozilla's Mail client (default on)</flag>
+	<flag name="methodjit">Enable JIT for JavaScript using MethodJIT for faster
+		JS performance. Hardened users can disable this USE-flag to use MPROTECT
+		on grsecurity kernels.</flag>
 	<flag name='roaming'>Build roaming extension support (default on)</flag>
 	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
 		installation with secure-delete enabled</flag>
diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.1.ebuild
index ddb0ddcd09ca..fd9e993f3e57 100644
--- a/www-client/seamonkey/seamonkey-2.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.1.ebuild,v 1.3 2011/07/05 19:29:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.1.ebuild,v 1.4 2011/07/08 16:37:14 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -26,7 +26,7 @@ if [[ ${PV} == *_pre* ]] ; then
 
 	REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
 	#KEYWORDS=""
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 	#HAS_LANGS="false"
 else
 	# This is where arch teams should change the KEYWORDS.
@@ -81,7 +81,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	webm? ( amd64? ( ${ASM_DEPEND} )
-		x86?  ( ${ASM_DEPEND} ) )"
+		x86? ( ${ASM_DEPEND} ) )"
 
 S="${WORKDIR}/comm-2.0"
 
@@ -224,7 +224,6 @@ src_configure() {
 }
 
 src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break.
 	emake || die
 
 	# Only build enigmail extension if conditions are met.
diff --git a/www-client/seamonkey/seamonkey-2.2.ebuild b/www-client/seamonkey/seamonkey-2.2.ebuild
new file mode 100644
index 000000000000..0275c3dc3ff4
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.2.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2.ebuild,v 1.1 2011/07/08 16:37:15 polynomial-c Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
+
+PATCH="${PN}-2.2-patches-01"
+EMVER="1.2"
+
+LANGS="ca cs de en en-GB en-US es-AR es-ES fi fr it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr"
+NOSHORTLANGS="en-GB en-US es-AR"
+
+MY_PV="${PV/_pre*}"
+MY_PV="${MY_PV/_alpha/a}"
+MY_PV="${MY_PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+# release versions usually have language packs. So be careful with changing this.
+HAS_LANGS="true"
+LANGPACK_PREFIX="${MY_P}."
+LANGPACK_SUFFIX=".langpack"
+if [[ ${PV} == *_pre* ]] ; then
+	# pre-releases. No need for arch teams to change KEYWORDS here.
+
+	REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
+	#LANG_URI="${REL_URI}/langpack"
+	LANG_URI="${REL_URI}/linux-i686/xpi"
+	LANGPACK_PREFIX=""
+	LANGPACK_SUFFIX=""
+	#KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+	#HAS_LANGS="false"
+else
+	# This is where arch teams should change the KEYWORDS.
+
+	REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
+	LANG_URI="${REL_URI}/langpack"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+	[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
+fi
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa +chatzilla +crypt +methodjit +roaming system-sqlite +webm"
+
+SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
+
+if ${HAS_LANGS} ; then
+	for X in ${LANGS} ; do
+		if [ "${X}" != "en" ] ; then
+			SRC_URI="${SRC_URI}
+				linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${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%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
+			#fi
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND=">=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.9
+	>=dev-libs/nspr-4.8.7
+	>=dev-libs/glib-2.26
+	>=media-libs/mesa-7.10
+	>=media-libs/libpng-1.4.1[apng]
+	dev-libs/libffi
+	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
+	crypt? ( >=app-crypt/gnupg-1.4 )
+	webm? ( media-libs/libvpx
+		media-libs/alsa-lib )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	webm? ( amd64? ( ${ASM_DEPEND} )
+		x86? ( ${ASM_DEPEND} ) )"
+
+S="${WORKDIR}/comm-release"
+
+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 ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if ${HAS_LANGS} ; then
+		linguas
+		for X in ${linguas}; do
+			# FIXME: Add support for unpacking xpis to portage
+			[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+		done
+		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+			einfo "Selected language packs (first will be default): ${linguas}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+
+	if ! use methodjit ; then
+		einfo
+		ewarn "You are disabling the method-based JIT in JägerMonkey."
+		ewarn "This will greatly slowdown JavaScript in ${PN}!"
+	fi
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patch"
+
+	epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		cd "${S}"/mailnews/extensions/enigmail || die
+		epatch "${FILESDIR}"/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
+		./makemake -r 2&>/dev/null
+		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
+			-i Makefile.in || die
+		cd "${S}"
+	fi
+
+	#Ensure we disable javaxpcom by default to prevent configure breakage
+	sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \
+		|| die "sed javaxpcom"
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	eautoreconf
+	cd "${S}"/mozilla || die
+	eautoreconf
+	cd "${S}"/mozilla/js/src || die
+	eautoreconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS=""
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS="${MEXTENSIONS},-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS="${MEXTENSIONS},-sroaming"
+	fi
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable methodjit
+
+	if use crypt ; then
+		mozconfig_annotate "mail crypt" --enable-chrome-format=jar
+	fi
+
+	mozconfig_annotate '' --with-system-png
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
+}
+
+src_compile() {
+	emake || die
+
+	# Only build enigmail extension if conditions are met.
+	if use crypt ; then
+		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+		emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare emid
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+	cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
+
+	if use crypt ; then
+		cd "${T}" || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	if ${HAS_LANGS} ; then
+		linguas
+		for X in ${linguas}; do
+			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+		done
+	fi
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \
+		|| die
+	domenu "${T}"/${PN}.desktop || die
+
+	# Add our default prefs
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
+		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
+			|| die
+
+	# Plugins dir
+	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir"
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
+
+	doman "${S}"/suite/app/${PN}.1 || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}