[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, profiles/, www-client/seamonkey/, ...

[Lars Wendler]

commit:     f3fd5f5a9e71f8bf16750df9453a751152b3db5c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 18:44:57 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 18:44:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f3fd5f5a

seamonkey: Big cleanup. 2.1 was moved to portage.

---
 profiles/package.mask                              |    2 +-
 www-client/seamonkey/Manifest                      |   58 +----
 .../files/2.1/seamonkey-2.1b1-configure-fix.patch  |   20 --
 .../enigmail/enigmail-1.1.2-20110124-makefile.diff |   74 -----
 ...nigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch |   11 -
 ...2-seamonkey-2.1-lowercaseequalsliteralfix.patch |   12 -
 ...enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch |   11 -
 ...-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff |    0
 www-client/seamonkey/seamonkey-2.1.ebuild          |  301 ------------------
 www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild |  320 --------------------
 www-client/seamonkey/seamonkey-2.2_beta3.ebuild    |   11 +-
 11 files changed, 10 insertions(+), 810 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 568b71d..cecd0a7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -6,5 +6,5 @@
 #
 
 # These are experimental use with caution!!
->=www-client/seamonkey-2.1_alpha1
+>=www-client/seamonkey-2.2_beta1
 

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index bfa8d9a..5f3360e 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,61 +1,9 @@
-AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4
-AUX 2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 744 RMD160 7c9bab23159e956813fa2e2a59dac5dbc16dbe60 SHA1 d29a9ded0cad3df137539642e6a6031c361c47ac SHA256 a8b217e3bf7902caab447f849712459f92e19c8889bc66c977019c603ddb99d4
 AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
-AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
-AUX enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch 386 RMD160 54acaf1f87ea3bc65d7e5027b074dcee93b6a1a0 SHA1 18b91e45c263ec1cacce63b2c0eeb266d6a69196 SHA256 5b6e504403aac97a083979e270ec874595d5ef9c5fdc60af067c20ec8f58a4f5
-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 enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch 386 RMD160 0ecafbbace7acefdf63f5b57ca90d70f31b56a2f SHA1 e83f76194e408b3ae3b4cb34e02a99a972354fc3 SHA256 6b9131ae198a8964504bece6004e2ea671df8f8a11af1fce25f45d3934b548b6
 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
 DIST enigmail-1.2.tar.gz 1326482 RMD160 868c73aa28566895d4b6c6b9cbf4602d75df0a73 SHA1 05fb80a99544f95bfa2531e6cd5cac8cf1e78780 SHA256 e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4
-DIST enigmail-1.2a1_pre-20110513.tar.xz 777568 RMD160 3657239cc1f3896881b852d141a8fbea1d4bb1bb SHA1 86548076b2b180cc3fa25cf121dde2ef37c95e68 SHA256 6bd68993292df117024cc3a6b6f324241f78efcaf140ff8b2c6f406b149890a9
-DIST seamonkey-2.1-be.xpi 795039 RMD160 b89a3a0a2fee13a819c2e02efcb57c6006766845 SHA1 37241e3ae3fa291256720b3dd840dec3958d5943 SHA256 87f5ab012318254ecf5e334e296f2e65695078b45db32aaac6b8ce871dbc6472
-DIST seamonkey-2.1-ca.xpi 814609 RMD160 270d8e566e8593228447164d507b6b1f42802128 SHA1 3f398531292c41720a5f7280e712230e85392379 SHA256 0816f4417b0f8649d88fd901935e089aa3ba1321c303b7ab19060d7f071c404f
-DIST seamonkey-2.1-cs.xpi 817990 RMD160 d81a6e3e244488c59ed769d4a9e2ef8928fedb39 SHA1 f8c54b25cf6b34a51882ce8e6a89f259609ae865 SHA256 000d71f5e81dba3c8b9303ba99f0acb6e8dd058d93d13d81dd8ff7ff68e53c4d
-DIST seamonkey-2.1-de.xpi 860216 RMD160 35193b4e3182aba31117639230263e16b333a7ef SHA1 d89d5ebbb798705548a9a1cd49688235a97947cc SHA256 975c6d6a999e707bceaf451ae11e8d3e53651cbc4c13aa26a7f8ef52597be0a2
-DIST seamonkey-2.1-en-GB.xpi 789980 RMD160 6e2f289ecb0849aee8932cb5b86f7cb5b6b13449 SHA1 e08f5bc24e06816621b06731a8ef9cd8e9ece621 SHA256 4f00bd90704ff8d2a6dd2b789e97bb3a2f7ecc6c3659020aacc289fac7977c19
-DIST seamonkey-2.1-en-US.xpi 789807 RMD160 519d6ecec79113d1ca26f44c3298ee51754514c6 SHA1 e01675ec3d41944f617d5a06b5c0b1869dabc972 SHA256 d24af54a3cd3c9963aa8afdb664bf02ca0aa81e4f437c77777585725019c134f
-DIST seamonkey-2.1-es-AR.xpi 816080 RMD160 2fffc0505df4ddf294ae326ad98eee2e05cc7810 SHA1 441e5dc6689fd6cf93159d1f97cbfe0e623c60e3 SHA256 dc6e7e1870a51e6dbdd0244b6ea54e5741499d61381d549ae0e4d7008af41af1
-DIST seamonkey-2.1-es-ES.xpi 795743 RMD160 9728f1f6946246252ca6025bd2530428f0425b82 SHA1 63627af5774e590c301e8b1ada467ba4c32b2099 SHA256 0ac88dad77a191997c2fcc64a5dc097e864beb926a94abec73cf0dde56dbc47a
-DIST seamonkey-2.1-fi.xpi 814960 RMD160 7c1f0df2d76ba9e62411ac94ce8ff88b65b39b7e SHA1 e74f05984d146801b2d453f6c93344af52384171 SHA256 d1ddd572ca63f706f683dc4d5fdd1aa7c80c10535593bcff632ce82927584e5f
-DIST seamonkey-2.1-fr.xpi 899043 RMD160 29edfa1229ef00df1916fb385de101caf461a59e SHA1 33572986ea761ab77c2f39fd4ad2b7ebc55bc9e3 SHA256 0fb181683f30c68f1bdf3f966baab1a0998b1860662765683b58b009621d3936
-DIST seamonkey-2.1-it.xpi 741721 RMD160 3ac3eabf6ac9ef97716113a84b908789fb4545f6 SHA1 9d2ccea93c32560a64c47fead281d98d4f8897f6 SHA256 eb821ad2e8fc015dc9be9d1ff4f84aff1348da5e029030627d8a3066e47a708f
-DIST seamonkey-2.1-ja.xpi 864361 RMD160 1f8bbfd8db1f9a71d4da6f5b87b49c96e0193004 SHA1 8a92852ac95b6b7b03bc4741db98b128dbebb199 SHA256 9ca92c7f2be842aa286b3e04263ac87025e5966601808860e0ef15dea4f8ffd2
-DIST seamonkey-2.1-lt.xpi 962406 RMD160 5593f179b561ea4b6c4a8e73c14064fe95115e75 SHA1 7cb8ae21b0398d2f9c7c23188da99ba35710a572 SHA256 ae621feaf31d4ee44752950e7427c9c76b182d4b824581cbaffad004d631e247
-DIST seamonkey-2.1-nb-NO.xpi 809401 RMD160 e2837a41c5587e3afe3ea214f5b07cad87943273 SHA1 39a51c0441a230f300cdb82e51c9c5b50047058c SHA256 985b17cd8ce897a0a467d71d8c6e58b324c1dfc8f4876242cab55d96a91ecd09
-DIST seamonkey-2.1-nl.xpi 807185 RMD160 132b74724634b54396c8b704c50e274a850889b1 SHA1 787d5b96be25a2dbf6eac37ea70fe7cad1ab2d99 SHA256 8fe7a4d7efcc17896eed3dec4085fa70f75c07e4b4b1fc610e3f3ecbbef8f06a
-DIST seamonkey-2.1-patches-01.tar.xz 63748 RMD160 e02f8d2f4530b46ad5a2f4d2e6af9431ad46ebd8 SHA1 084ac103fcfef70514cd81861ffdf808e3b408f6 SHA256 01d42ad81f949b2eea17c3ae15bd5b0b24b5c3066ce1e8e590af4b22394b3584
-DIST seamonkey-2.1-pl.xpi 828384 RMD160 7277f35f03a618202ac7b9821adfb120116cc408 SHA1 21a594da4d35496077ae06c6fc27dfb8528eec0d SHA256 c4652efd647a13a880bac27f22afe74c2c127ca419f1a2d567dab17c70fbc051
-DIST seamonkey-2.1-pt-PT.xpi 845399 RMD160 51f1a62774ba5ff778856ccd6f48479f0d4cdb26 SHA1 90e89d139f5906ac4ad5039a40834d3f14202d05 SHA256 2fcd9eeb7ae41d21bd3ac8b893a890565a7fc9f8eee8feaddace82fae2419cec
-DIST seamonkey-2.1-ru.xpi 891790 RMD160 e77ca9a8c4a47013a56115b1708d6ad058520bfa SHA1 ef0428c0998620f85c06e44538ab37ffa181a273 SHA256 d79872afe9404b110cb76b27a329a22b4cc278c8cad0a8ff11f7b40864eab1d7
-DIST seamonkey-2.1-sk.xpi 843122 RMD160 27cc8e0c31c6b8eef6081b57b014d44a7c9effc2 SHA1 5694fb9b799d144029c06016c2410614cddf5ab0 SHA256 591043092fe38c8d468070c910cd42b82e82cc489d3e3de2169d42e781856238
-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.1rc1-patches-01.tar.xz 62816 RMD160 ade4744c36b6ce2778c44c0ae4b5fc6254cddee1 SHA1 68cb19b0d658e065d379e393f8aec88158657952 SHA256 eeb80ba57b786c8516d1892c6379047d1613a28710cadc300736bdf0c36ae818
-DIST seamonkey-2.1rc2-be.xpi 795039 RMD160 b42bff60d60fabca068508f32006bf9e78a04dec SHA1 f4dd44c691cc14d87a72a093dfbe987acede0581 SHA256 d0d1aaeacac2593b8c22632435835b177bbc6060e9f9370f9bccdd80c8a7b993
-DIST seamonkey-2.1rc2-ca.xpi 814609 RMD160 08364ee1dafc19b108f915268a60e42659fa3f36 SHA1 245ef939f039168624178fd7f440031cf0e9a4cf SHA256 44b4e66a0ef563b597d03691f25191dfd41c0a57e6e2c958088487ebaf53e8e7
-DIST seamonkey-2.1rc2-cs.xpi 817990 RMD160 a4491f9568787ca7accb611fe82c0c4b4807eaac SHA1 7dd421b5b568e80f2eda42fd8306a15fa29554c7 SHA256 e1828b383884a0ba575f6fe2459a0c3c8d1d6225e5c70f81b720f96a12179452
-DIST seamonkey-2.1rc2-de.xpi 860216 RMD160 e44ecabfb15e38869975e90411f23a8bf01ace3c SHA1 d09e1af9cf733d702c4890ac9c2c9ffcb127b178 SHA256 62ef53e06237da97983c10b12b50d740135e2d81594fe229e7e4ccf004977523
-DIST seamonkey-2.1rc2-en-GB.xpi 790026 RMD160 5032a1f6eca3756f230d2369a8abd7adf3d5789f SHA1 99be9344f8b5854acb3c4ba483b4344f0bc0ce0a SHA256 3280a221245884f06bcf67fb7fcebfffb33736836ba51cefdfdbc511b9f987c5
-DIST seamonkey-2.1rc2-en-US.xpi 789807 RMD160 dae6c85050b52c66eee873175417c8c3353830b5 SHA1 6ef4fd8d398a7caef151a9a579335e94ea0dce25 SHA256 a35cd10f21b6c142bc8c1cb43ee046a7956aa847478de070c0aa633da0766151
-DIST seamonkey-2.1rc2-es-AR.xpi 818679 RMD160 2a474581a64e92a6a395ab9273e9a1418ae5f3cf SHA1 e13520ed58542daf5013abe6f1cc47e3b911af55 SHA256 a34af6f3d69ff1403ed14e28f7c650b145c62c836d3c86977b5aa6dc00e1bd86
-DIST seamonkey-2.1rc2-es-ES.xpi 795742 RMD160 57aa475b5cff39df4ddfea252f9a5c7f3c66a4dc SHA1 11461652e7895b0085534a29ec34b5fbd7524cb8 SHA256 9ff2a85b345f91fa5258e874fec6ce44a234d2612589c57e0a11a0b5fc81490c
-DIST seamonkey-2.1rc2-fi.xpi 814960 RMD160 d307f23b85e71653831f67831addadd99e3b64df SHA1 f55808a7142943b9d13eacd59947591d35c10aa7 SHA256 2aef6096ebc7dd5fc1dcfebb19d52a39fec865738985e054de4d31625599f350
-DIST seamonkey-2.1rc2-fr.xpi 899043 RMD160 8e9f97963377c67363b98a112063f586918b9abf SHA1 7503d4b169b719643633dedaa1031bc99fe858f2 SHA256 3a470e80dc383aa0009c1e5e3df963093229d30792c9b7b150ef3003fb013dc8
-DIST seamonkey-2.1rc2-it.xpi 741721 RMD160 309bebf1f93c32d06cce9ff36369992d9d6abdb5 SHA1 bb7e5b18383d73d88eb4b269c27a61f5f81254ef SHA256 353c6863ab16a413d731731bf183a6e5138e0ed44a44db073b57bfdabe64062f
-DIST seamonkey-2.1rc2-ja.xpi 864361 RMD160 75b5e8d09b62384ac6df526f3bd3fc5a960fa02e SHA1 9b555654cac43f692c1411a394833c1b2c8e927a SHA256 76989151fa058956aa4835a1113e50309814408bf129b248695e0f12d9a05e53
-DIST seamonkey-2.1rc2-lt.xpi 962406 RMD160 2c253ce9010d76c54b985c721730021867091a3a SHA1 0dd3b43e1ce977f76bc1a21ef57a1021d0ac8337 SHA256 12b64c31c74796985983be7af842a05ba3fecd203fde61b13fae01783e0d57c8
-DIST seamonkey-2.1rc2-nb-NO.xpi 809401 RMD160 12848398e3caafe66e9c6b880307fdcec0d5f5e1 SHA1 b429e10201e157a075e53bcafba8b16346dacd3f SHA256 c90f74621f5bf5d7b6dee764bbf3db2d228cffbb80aff4d6c919dcd436c939a9
-DIST seamonkey-2.1rc2-nl.xpi 807185 RMD160 0bda395a41145464b770e828b349d2bc63a8cd0a SHA1 aebbe8e643ed43217982af9af169e261fcd6adee SHA256 da99b711f2fe2b9a25f1f13c85d890cf030b979c560c387f747d8f127fe4cbc9
-DIST seamonkey-2.1rc2-pl.xpi 828384 RMD160 8f68093bd03ae9394246b467fd336acbee20a40b SHA1 794f71274a1aa18a61ddd7070072f689e575834c SHA256 e7b60312108b06e45835e230e54f84a5bb7016f09786522fda166597c5abfa48
-DIST seamonkey-2.1rc2-pt-PT.xpi 845399 RMD160 8d2f39f4173854f412fdd8eded08a7a3c7ea83fb SHA1 0600f1536edcca6f04f7867c2d9dc2ed074b89b1 SHA256 3ade3f530767ab3b0b7bd125f11371791f21facc0662f1e12a10512557926c91
-DIST seamonkey-2.1rc2-ru.xpi 891790 RMD160 7afca7016e9f9a36c8c9f533f45ca16f94fcfcb9 SHA1 ecce030a2d8f2eede33f6a80e8142e7fe8dadf93 SHA256 f1bbe9f094884315051eb83c11de8510c0114effb8e1660912f1147faa905fb8
-DIST seamonkey-2.1rc2-sk.xpi 843122 RMD160 ebc43feff78380769fe77307a290c1f8b9b9f5f8 SHA1 8157bba853b4300f75f8712aa96036c604f63ae2 SHA256 f864efe9ac522684d85b4daa7fcbbc794a600b16326b1b90a6820615d5cbf35e
-DIST seamonkey-2.1rc2-sv-SE.xpi 872350 RMD160 a76848536344344f70be6086e5ab744aaa1f05c1 SHA1 c572e47361e1d2b88ef147581ba2e6ebe3b65704 SHA256 e5c060c38d7623a516cc40d19d9fd73162ea670b4bf09636f5750c28e08ba7de
-DIST seamonkey-2.1rc2-tr.xpi 807997 RMD160 39b77333f6a2e5c0fd7aacc78f5301f1875d4e86 SHA1 4e74e0208c1af8d2c17b7cc6f11cf0c14cbb302e SHA256 0b4568ad637da667118dc3a6d64b3e5ff554172a2fbc6b08d21f93d161a76f29
-DIST seamonkey-2.1rc2.source.tar.bz2 84298154 RMD160 92cebd02db7da34ef2da2e8c29eab73744b64e68 SHA1 6bbffc04e81d10ac7999d3deb5f0d3caa6e4978f SHA256 6046ca1836d5c3d45ff42dbaf42b57131c7c9e82de189e9cbaa5b1206ffdee38
 DIST seamonkey-2.2_beta3-ca.xpi 811511 RMD160 707ecbfdf6ccd9a09af91daba0b3b810c60b2daa SHA1 d8fdeaec7d7432d510e1a6adf8017f5a6c236022 SHA256 57ec4c077c2742324a68373ff39d82c464da0c80399b037165215a8c4fd89b6e
 DIST seamonkey-2.2_beta3-cs.xpi 814944 RMD160 ea93b0dd8dc5df4403cdfa77c307ef855973de14 SHA1 fe3ea460ffcfb7b73d719c0bc274d9639e2aad3d SHA256 b717cc8b5ad4c3100c685da9301e9eeda2e14908cd373df9f1c2608b44b08585
 DIST seamonkey-2.2_beta3-de.xpi 857283 RMD160 47f7d394fa74fca9d3d12c7969a331212e40c9d5 SHA1 7cd0b92bdf814ae96e4c901d507aa0c563cc76af SHA256 6c9cb7bd2907a71d66e4bfdbce8ea89d1419b027ffc86f5e75af0434eaf60c13
@@ -78,6 +26,4 @@ DIST seamonkey-2.2_beta3-sv-SE.xpi 869508 RMD160 14612bf5878c8b2045cbc48f794b333
 DIST seamonkey-2.2_beta3-tr.xpi 805151 RMD160 5c436f4ca05300d3d552a875a0f2f371eaec9e23 SHA1 06ca655bb4bde870ac25a635f77c7d53b158bd71 SHA256 6149ee4f6d18bff788b423e69316438f2a5cb2598195528306a5f3ca8164b14e
 DIST seamonkey-2.2_beta3.source.tar.bz2 87651163 RMD160 b37b691f56ec9a5741d99bbbe36176ba5c40fe5d SHA1 acc0f628087fb2b8bc5db24fb1b502e7eff896d5 SHA256 a75c48e0ad8b47f1965099594aaf2ae922dc7349f32a027f883d65c279dc2954
 DIST seamonkey-2.2b1-patches-01.tar.xz 17104 RMD160 d82c7d464be8bd3f593570529910bcb371797a6a SHA1 3c5584a1fe22a8cb5b69423499c32d25a0335606 SHA256 c4704e8959f65e02e6b10546de43c16cbbf57a28289a5f7e7084925439442278
-EBUILD seamonkey-2.1.ebuild 8481 RMD160 b9deb0a6d8168b02064d845b02f78d0bd8dbd503 SHA1 12ffb6eec75f09c0534ccd9dddc8bfa0bce4511d SHA256 2ee2c62bf907817f74e2a188c37dfda5dcaa53f3ad44ce6cfc7892b22446a1a7
-EBUILD seamonkey-2.1_rc2_pre1.ebuild 9310 RMD160 10f4f54ba31e90286932cabd8a30e2b7ec945a9e SHA1 3d6eb075f73f9a3424ff66a7d076595ce88ba86a SHA256 3bcbd48eff61456be7c3c59d64528c642c1abdea3d82f74d47395c5507016c23
-EBUILD seamonkey-2.2_beta3.ebuild 8588 RMD160 70dbfdb4c09bcf54e640c1e115ddbdf77f0c0bf1 SHA1 6fb140d950e9c0597f2ec7ecc4ac2e25cd03a197 SHA256 1cea4681842495fed6146856de547bf4a541d7ca122e569ff5d6b3864e38dd2c
+EBUILD seamonkey-2.2_beta3.ebuild 8659 RMD160 e7907e1f47bedf077586c78c92c0dbf99525b78e SHA1 01b32b5aa89bae459952dbfacf457117c0a9d65c SHA256 7dd8ad36512f8054d0e5822cb73f94e57783efa17f81418113edcc86c79dda8e

diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b1-configure-fix.patch b/www-client/seamonkey/files/2.1/seamonkey-2.1b1-configure-fix.patch
deleted file mode 100644
index 00ae69f..0000000
--- a/www-client/seamonkey/files/2.1/seamonkey-2.1b1-configure-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	2010-10-08 21:41:12.000000000 +0200
-+++ configure.in	2010-10-20 21:28:26.191633777 +0200
-@@ -4858,7 +4858,7 @@
- dnl =========================================================
- MOZ_ARG_DISABLE_BOOL(mailnews,
- [  --disable-mailnews      Disable building of mail & news components],
--    MOZ_MAIL_NEWS=,
-+    MOZ_MAIL_NEWS=0,
-     MOZ_MAIL_NEWS=1 )
- AC_SUBST(MOZ_MAIL_NEWS)
- 
-@@ -4867,7 +4867,7 @@
- dnl =========================================================
- MOZ_ARG_DISABLE_BOOL(ldap,
- [  --disable-ldap          Disable LDAP support],
--    MOZ_LDAP_XPCOM=,
-+    MOZ_LDAP_XPCOM=0,
-     MOZ_LDAP_XPCOM=1)
- 
- dnl ========================================================

diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-20110124-makefile.diff b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-20110124-makefile.diff
deleted file mode 100644
index 62bcefb..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-20110124-makefile.diff
+++ /dev/null
@@ -1,74 +0,0 @@
---- enigmail/ipc/Makefile.in
-+++ enigmail/ipc/Makefile.in
-@@ -34,7 +34,7 @@
- # ***** END LICENSE BLOCK *****
- 
- 
--DEPTH		= ../..
-+DEPTH		= ../../../..
- topsrcdir	= @top_srcdir@
- srcdir		= @srcdir@
- VPATH		= @srcdir@
---- enigmail/ipc/public/Makefile.in
-+++ enigmail/ipc/public/Makefile.in
-@@ -34,7 +34,7 @@
- # ***** END LICENSE BLOCK *****
- 
- 
--DEPTH		= ../../..
-+DEPTH		= ../../../../..
- topsrcdir	= @top_srcdir@
- srcdir		= @srcdir@
- VPATH		= @srcdir@
---- enigmail/ipc/src/Makefile.in
-+++ enigmail/ipc/src/Makefile.in
-@@ -34,7 +34,7 @@
- # ***** END LICENSE BLOCK *****
- 
- 
--DEPTH		= ../../..
-+DEPTH		= ../../../../..
- topsrcdir	= @top_srcdir@
- srcdir		= @srcdir@
- VPATH		= @srcdir@
---- enigmail/ipc/build/Makefile.in
-+++ enigmail/ipc/build/Makefile.in
-@@ -34,7 +34,7 @@
- # ***** END LICENSE BLOCK *****
- 
- 
--DEPTH		= ../../..
-+DEPTH		= ../../../../..
- topsrcdir	= @top_srcdir@
- srcdir		= @srcdir@
- VPATH		= @srcdir@
---- enigmail/ipc/modules/Makefile.in
-+++ enigmail/ipc/modules/Makefile.in
-@@ -38,7 +38,7 @@
- 
- # Specify these as parameters to the make command
- 
--DEPTH		= ../../..
-+DEPTH		= ../../../../..
- topsrcdir	= @top_srcdir@
- srcdir		= @srcdir@
- VPATH		= @srcdir@
---- enigmail/ipc/tests/Makefile.in
-+++ enigmail/ipc/tests/Makefile.in
-@@ -34,7 +34,7 @@
- # ***** END LICENSE BLOCK *****
- 
- 
--DEPTH           = ../../..
-+DEPTH           = ../../../../..
- topsrcdir       = @top_srcdir@
- srcdir          = @srcdir@
- VPATH           = @srcdir@
---- enigmail/lang/current-languages.txt
-+++ enigmail/lang/current-languages.txt
-@@ -1,5 +1,4 @@
- ar
--bg-BG
- ca
- cs-CZ
- de-AT

diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch
deleted file mode 100644
index 2dbfa07..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -23,7 +23,7 @@
-       <Description>
-         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-         <em:minVersion>2.1a1pre</em:minVersion>
--        <em:maxVersion>2.1b2</em:maxVersion>
-+        <em:maxVersion>2.1</em:maxVersion>
-       </Description>
-     </em:targetApplication>
-     <em:targetApplication>

diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
deleted file mode 100644
index 7fdd20f..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- enigmail/src/nsEnigMsgCompose.cpp	2011-07-03 10:45:45.000000000 +0200
-+++ enigmail/src/nsEnigMsgCompose.cpp	2011-07-03 10:45:17.000000000 +0200
-@@ -1092,7 +1092,8 @@
-       nsCString left(tmpStr);
-       left.SetLength(15);
- 
--      if (left.LowerCaseEqualsLiteral("x-mozilla-keys:")) {
-+      ToLowerCase(left);
-+      if (left.EqualsLiteral("x-mozilla-keys:")) {
-         DEBUG_LOG(("nsEnigMimeWriter::OnDataAvailable: workaround for 'X-Mozilla-Keys:' header\n"));
- 
-         tmpStr.StripWhitespace();

diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
deleted file mode 100644
index eeec0bb..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -23,7 +23,7 @@
-       <Description>
-         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-         <em:minVersion>2.1a1pre</em:minVersion>
--        <em:maxVersion>2.1b2</em:maxVersion>
-+        <em:maxVersion>2.2</em:maxVersion>
-       </Description>
-     </em:targetApplication>
-     <em:targetApplication>

diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff b/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
similarity index 100%
rename from www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
rename to www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff

diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.1.ebuild
deleted file mode 100644
index 0d147ad..0000000
--- a/www-client/seamonkey/seamonkey-2.1.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.1-patches-01"
-EMVER="1.2"
-
-LANGS="be 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"
-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}"
-	#KEYWORDS=""
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 gconf +roaming +webm"
-
-SRC_URI="${REL_URI}/source/${MY_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/-/_}? ( ${REL_URI/build?/build1}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_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%%-*}? ( ${REL_URI/build?/build1}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
-			#fi
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.9
-	>=dev-libs/nspr-4.8.7
-	>=media-libs/libpng-1.4.1[apng]
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	crypt? ( >=app-crypt/gnupg-1.4 )
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-lang/yasm"
-
-S="${WORKDIR}/comm-2.0"
-
-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 "${MY_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
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patch"
-
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
-
-	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.1-lowercaseequalsliteralfix.patch
-		./makemake -r 2&>/dev/null
-		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
-			-i Makefile.in || die
-		cd "${S}"
-	fi
-
-	#pushd "${S}"/mozilla &>/dev/null || die pushd
-	#popd &>/dev/null || die popd
-
-	#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 '' --enable-jsd
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	mozconfig_use_enable gconf
-
-	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
-	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() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break.
-	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}"/"${MY_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
-}

diff --git a/www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild b/www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild
deleted file mode 100644
index 9b6cfed..0000000
--- a/www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.1rc1-patches-01"
-EMVER="1.2a1_pre"
-
-LANGS="be 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"
-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}"
-	#KEYWORDS=""
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 +composer +crypt gconf ldap +mailclient +roaming +webm"
-
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	crypt? ( mailclient? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-20110513.tar.xz ) )"
-
-if ${HAS_LANGS} ; then
-	for X in ${LANGS} ; do
-		if [ "${X}" != "en" ] ; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_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%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
-			#fi
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.9
-	>=dev-libs/nspr-4.8.7
-	>=media-libs/libpng-1.4.1[apng]
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-lang/yasm"
-
-S="${WORKDIR}/comm-2.0"
-
-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 "${MY_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
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patch"
-
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
-
-	if use crypt && use mailclient ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
-		eautomake
-		makemake2
-		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
-			-i Makefile.in || die
-		cd "${S}"
-	fi
-
-	#pushd "${S}"/mozilla &>/dev/null || die pushd
-	#popd &>/dev/null || die popd
-
-	#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
-
-	if ! use composer ; then
-		if ! use chatzilla && ! use mailclient ; then
-			mozconfig_annotate '-composer' --disable-composer
-		fi
-	fi
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	mozconfig_use_enable gconf
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mailclient mailnews
-
-	if use mailclient && use crypt ; then
-		mozconfig_annotate "mail crypt" --enable-chrome-format=jar
-	fi
-
-        # ZOMG! Mozilla guys wanna have APNG in libpng if building with
-        # system-libpng. Kids, leave your fingers from drugs that make you
-        # do such nasty "extensions"!!!
-        # See https://bugs.gentoo.org/183370 for details.
-        mozconfig_annotate '' --with-system-png
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	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() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break.
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt && use mailclient ; 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 && use mailclient ; 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
-
-	if use mailclient ; then
-		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
-	fi
-
-	if ${HAS_LANGS} ; then
-		linguas
-		for X in ${linguas}; do
-			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_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
-}

diff --git a/www-client/seamonkey/seamonkey-2.2_beta3.ebuild b/www-client/seamonkey/seamonkey-2.2_beta3.ebuild
index 1aec910..c75cfce 100644
--- a/www-client/seamonkey/seamonkey-2.2_beta3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.2_beta3.ebuild
@@ -72,6 +72,8 @@ if ${HAS_LANGS} ; then
 	done
 fi
 
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
 RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
@@ -83,7 +85,8 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-lang/yasm"
+	webm? ( amd64? ( ${ASM_DEPEND} )
+		x86? ( ${ASM_DEPEND} ) )"
 
 S="${WORKDIR}/comm-beta"
 
@@ -140,7 +143,7 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/patch"
 
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
+	epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
@@ -153,7 +156,7 @@ src_prepare() {
 	fi
 
 	#Ensure we disable javaxpcom by default to prevent configure breakage
-	sed -i -e s:MOZ_JAVAXPCOM\=1::g ${S}/mozilla/xulrunner/confvars.sh \
+	sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \
 		|| die "sed javaxpcom"
 
 	# Disable gnomevfs extension
@@ -201,7 +204,7 @@ src_configure() {
 		mozconfig_annotate "mail crypt" --enable-chrome-format=jar
 	fi
 
-        mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --with-system-png
 
 	# Finalize and report settings
 	mozconfig_final