* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, profiles/, www-client/seamonkey/, ...
@ 2011-07-03 18:45 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2011-07-03 18:45 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, profiles/, www-client/seamonkey/, ...
@ 2011-10-01 7:12 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2011-10-01 7:12 UTC (permalink / raw
To: gentoo-commits
commit: 4ff153b98c949b975e8549745f9d210e3fcf7737
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 07:05:40 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 07:05:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=4ff153b9
seamonkey: Bumped to latest beta version. Removed old betas/rcs. Adjusted p.mask file.
---
profiles/package.mask | 2 +-
www-client/seamonkey/Manifest | 79 ++---
www-client/seamonkey/files/all-gentoo.js | 1 -
.../enigmail-1.2-seamonkey-2.2-versionfix.patch | 11 -
...-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff | 28 --
...1-scrollbar-mouse-interaction-improvement.patch | 105 +++++++
www-client/seamonkey/seamonkey-2.2_beta3.ebuild | 311 --------------------
...-2.2_pre1.ebuild => seamonkey-2.5_beta1.ebuild} | 71 ++++-
8 files changed, 190 insertions(+), 418 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index cecd0a7..134b0d8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -6,5 +6,5 @@
#
# These are experimental use with caution!!
->=www-client/seamonkey-2.2_beta1
+>=www-client/seamonkey-2.5_beta1
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 11762b7..87b0425 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,51 +1,32 @@
-AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
-AUX enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch 392 RMD160 77802eeb8849aa996ce6c27fc6f32ab7b55f8744 SHA1 cc7a8758e4efdd8556a2c8e2812de89fceaa3242 SHA256 37cca51c4f7b05644576ee758c1fa34e36708e4117520f5744f8b94e719d5cf7
+AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b
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 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
-DIST seamonkey-2.2_beta3-en-GB.xpi 787529 RMD160 18e345266071d34269368c7c3b7e99f59f4a647f SHA1 058945482543f45d772dc86afa2adc1ce1031648 SHA256 abb498da5e373fe45abda99301fb3ea3026cab1f42f776f906f6346721f92dee
-DIST seamonkey-2.2_beta3-en-US.xpi 786992 RMD160 1d2e2d580cfdeef7900bb23f5d3c22f7cc139fa2 SHA1 f2cc164c91a8d56aef5d51f5fa7396b30df33a9f SHA256 dffc830f5b261e48472a95a9b2a6cdaeb2ce60dee80ccf0f8f3de67c9fe4c828
-DIST seamonkey-2.2_beta3-es-AR.xpi 813118 RMD160 e3f577b90e58866ca5b95290120db6fe90016d85 SHA1 590befea07681513d1f9fa751d6f742136ff97a5 SHA256 b07d808af162e8774a8afc2f6049d97541c6299341eab0e35310844fd3a00123
-DIST seamonkey-2.2_beta3-es-ES.xpi 785711 RMD160 38eb08b6e08a44013cd32e04a3c6cae3bb9a7030 SHA1 4d81eeb25aa0b2e0576de6e6fbcd2429b6d6c228 SHA256 4a31e13ea6ed62cb54c456caa86ae4f3a40ce917676cf3ded6d81457b3ee5b3f
-DIST seamonkey-2.2_beta3-fi.xpi 807217 RMD160 c9439520e4801671337dd6415ae49d202e9b9124 SHA1 c54788bf381b1000e50c416eeddba1300159d3c3 SHA256 71fcd09dd1d54c4c413e753aab92dc4a89e4607b1b3a08527aafb9c964e2469f
-DIST seamonkey-2.2_beta3-fr.xpi 896109 RMD160 ec4194a4f434c8838f72d3a1f9e641d9663fb159 SHA1 441f4f7327e2f729ebb01e7bf78c3ef6b8704f7c SHA256 54e4fca778c7c157c72cf022f900cf89ea4dbcc124ccee11f67ca68b38c71aa6
-DIST seamonkey-2.2_beta3-hu.xpi 826025 RMD160 85dbee9a79469fa8f2323b405725ded2d597c037 SHA1 07d9e6bb32549c2d626a6724c68a0049634cc309 SHA256 935d0edc2f3bad4e5be3c4b72dc4c43881b765539ccc18527f228ed665d13587
-DIST seamonkey-2.2_beta3-it.xpi 739672 RMD160 a48c78bead159dd69cadcb52e1ed2fe9b31e99d5 SHA1 680d21c6650edfd9ed318550a8e4ea62105f6401 SHA256 c7283798b413c493aeb550b1996e941db046e2fcc0cabac40950c166a6e65b80
-DIST seamonkey-2.2_beta3-ja.xpi 861377 RMD160 af32bbf6c3b7510ad14ba6eb54a1a11f43431c8c SHA1 7077808730dd3b0eacaa295d44d3ff0271c8bb8e SHA256 3847e4bb6e2d187249f1ed24e0dd78c5b3ae2b3520465c176611b3081c82ca7e
-DIST seamonkey-2.2_beta3-lt.xpi 959540 RMD160 0e4a283e3a41a4630891a31f8302fb19b9b0ffb7 SHA1 020a98b0527c5ac62a269a753553b8f96f21368e SHA256 28a47c7ef1a776a8c0e1a240078ac0590ccc34915f2497c96f7bc35117c131bb
-DIST seamonkey-2.2_beta3-nb-NO.xpi 805675 RMD160 8a7dae1740f7a3ee91f5fd8b15968f26d06ccfc0 SHA1 071fb62068d40c89d6161e5fb059d93f1507520d SHA256 5011af8aaf1e68aee3f2e8a4dcbf25d28a1efdc481100d9253b2277ca40b8f60
-DIST seamonkey-2.2_beta3-nl.xpi 804311 RMD160 b783e98eda576f66f3d062944e02d9b23ae9a9ca SHA1 f9d83664671a6d63aeabad4651ff31be16097968 SHA256 daa5e46016e77b76978a442d28b81a4c836539e666d204895909d07613cde129
-DIST seamonkey-2.2_beta3-pl.xpi 825435 RMD160 e60c7d8ef959201dc47d5f7054a12e75d318d2a6 SHA1 64fd488ad81f447a089342a2a61ee03ed62f92f0 SHA256 61c5c7abbac2e9596f17971d50757db9de6d0101210917b4baf6861277d2ae70
-DIST seamonkey-2.2_beta3-ru.xpi 889516 RMD160 4a3230af49032a9644e689afb5f278e0c1fa60fe SHA1 a8936950e1570c0d9310df9c02bf409f456796dc SHA256 1a66d738cacf50b7b5545f0d91cd92e46d33bb5e1278cf826869360072db870e
-DIST seamonkey-2.2_beta3-sk.xpi 840212 RMD160 11b1836d17f623ca112c697abf091d01567b38b5 SHA1 2ae8fae11073a27c9b3d5f927db47bced5a3e1e9 SHA256 dbf80850908e62f6f85b5f3b6a19f2447829142732de02cc63e9b9baeace28e2
-DIST seamonkey-2.2_beta3-sv-SE.xpi 869508 RMD160 14612bf5878c8b2045cbc48f794b33378f2f3efc SHA1 20194241f522aa076d3c737f7b42b7cad0e12a64 SHA256 ffd7831356adf92cda03ccbd0c0ca123adcb0a9d6dce4a14b3441f67c25a8ca7
-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.2_pre1-ca.xpi 811514 RMD160 b347be1636186a08233dc9d4b4bd1315e672f523 SHA1 fb0217b04325ef3bdf5ea2b40485292812097272 SHA256 e188bd6a2e502015f22b0eca22788801b571c37ef095a94b3bd42d3b45600869
-DIST seamonkey-2.2_pre1-cs.xpi 814944 RMD160 4ab3ff1830f71456f30e5a290dda60d4c8595b97 SHA1 51d13c1f2a3c3a25ca8cc7e12c94f25a646fe9a2 SHA256 bdcf8d7c5d5f3a1717858302659742e45e91b5e29926e531779dc0296575eaf3
-DIST seamonkey-2.2_pre1-de.xpi 857283 RMD160 600a8de7c6ea902d487528c9ff0e77ccf427e774 SHA1 f562908fa3345cda27bcab31b1f2ce6d7926b2a6 SHA256 e633c6aa008832478965b045de76413a38959b5b08ebfbe5b32a4d7585aa2b5a
-DIST seamonkey-2.2_pre1-en-GB.xpi 787529 RMD160 f0f9fda1b529805eb5397ab6258a24b1dd91aaa1 SHA1 4a1e6fa0e6ef9df66ff4fc6bf082c302424feb11 SHA256 35b81e07e7eff19825ab432f0d4c3f2414847470fd7abe1eadf4af326ad5b371
-DIST seamonkey-2.2_pre1-en-US.xpi 786992 RMD160 1210e6d8bab9fa1434d317969670c8f71146a4cc SHA1 3e48b3a6c13509e792482b4058b038d65772d8f7 SHA256 d4fa3ccc07c89c8997082d3e384649de0d2a0f401b1ea2d1bded8bfefcf9946c
-DIST seamonkey-2.2_pre1-es-AR.xpi 813118 RMD160 33c24abd9969ea037849f3fb5435506e112c987c SHA1 d9af5d59e8ba0eed44bc48a1fdbe039458f26d75 SHA256 df6b0569db9bd12663438cea94356075348795b6a96d2d02e4fa472b0ecaf426
-DIST seamonkey-2.2_pre1-es-ES.xpi 785711 RMD160 89cfe9543eb75022d5f88fc49be713d7e6eb6488 SHA1 698fc8b98a8ad39fbe6241f2ef8417328cc4b84a SHA256 9ab5f1cf125046288db9d177c6adea3ada827f92dc8e913c8698d9e8a7aa0a10
-DIST seamonkey-2.2_pre1-fi.xpi 807217 RMD160 8f43e8b9f05d4f90c64419fe999a7cd943ca9730 SHA1 0298c1e803b9325723c20980112d7bc8076b4cda SHA256 9c465af89b24f26e4894b7ca225b258d7457ed7b4f1c0bc99d08dc5fd19d41c8
-DIST seamonkey-2.2_pre1-fr.xpi 896109 RMD160 7ccb2c64e2c80b12df92f57930b2bec99e9290a8 SHA1 2a848a7c669319510200890ac60b37d7fb799ef2 SHA256 b6d05c73dca20873e0237316054ef30ca04dd7b58c5bcd9c8ca1e520b55353e7
-DIST seamonkey-2.2_pre1-hu.xpi 827308 RMD160 0479b9c34f6e86fd211f67ce74493aae5409013a SHA1 74ca05ce8f1c0065ad8a13687f5521eeade425ee SHA256 b194c9f245d83431ce346d6a53c957c638c81701d13c365369f3e4c7dedaa653
-DIST seamonkey-2.2_pre1-it.xpi 739672 RMD160 ab92407f98ac9ee3b451e1839c06ba888d79d237 SHA1 d444a8125322a696191f68d0150053bdefc3a565 SHA256 4083c243554588ddc138c45419f4299bcb6f4b2f58609da12c676c1bef2688ba
-DIST seamonkey-2.2_pre1-ja.xpi 861377 RMD160 ed10c4891683a9969eabe848c3e67664e052528d SHA1 fc43d7fbe558053c9299605bb07d7d3b983a5fc1 SHA256 995cb767c5bde1ab8bc2ba4dccd20edd517d15c55ef564be2b38abebcf2f2b36
-DIST seamonkey-2.2_pre1-lt.xpi 959540 RMD160 b73f393e8cff549d8ad61ef29c3329b20da051c6 SHA1 f916eeb3c38bc969936c371752b54d3d6c41ff16 SHA256 d852ac5f1d14319f2a1622aae42c9bb5c0fb3ed476c77aa724af6736aad6bcaa
-DIST seamonkey-2.2_pre1-nl.xpi 804311 RMD160 3152f7858a2c7ee1b7884829da8be1a07b9bb062 SHA1 342e820d13a56781505ce205ed9f93ccc5b25406 SHA256 e4de37961a39f173ee6e35f3b3e573c3e169af87c1fcfb97aa6bc84eebdd84f1
-DIST seamonkey-2.2_pre1-pl.xpi 825438 RMD160 36670711251ef73afa5d155b9d18720cb04180ea SHA1 3cb1e4ace433840c836ea4f46c85dc286beef9b6 SHA256 08d327437027e8a4c1623479db0360a1aa57dca132f2360a0969b68dd0ea7367
-DIST seamonkey-2.2_pre1-pt-PT.xpi 842511 RMD160 d37117428cde901af08db80ad1ef3daec51cf60f SHA1 07242d4f59d365ebcaceb0fde74145d4ff8e12e6 SHA256 f55583699ab1357c3ade96ca6b1805791dc2437cb9cd25c65eb9814b86fa5bb0
-DIST seamonkey-2.2_pre1-ru.xpi 889516 RMD160 8de38b4ca247e47ced6ddfb0790185477dce94f9 SHA1 391d515b3e19d3c0b597bad63017aa24ada414ca SHA256 291cc0204e78c3f157b9e868f9700f633dedd60d7645281ad8cfd9767bf551a5
-DIST seamonkey-2.2_pre1-sk.xpi 840212 RMD160 c3507a4eb61e93d46240c396aab757ec08c15e88 SHA1 99c07841520850245e1b600851cabc904922ea1b SHA256 335393b00bbf1e60fee8aab4f042c681505056fac86fb43c9af21affe9b41004
-DIST seamonkey-2.2_pre1-sv-SE.xpi 869508 RMD160 123d063acbf085413616c166a872b6300bc94536 SHA1 2f411188457790deca0f1ede825075a13c7006ef SHA256 40db9d5bcaf8b7453fa146a3b3514fece8ba48da39b724a09784876e36d9a374
-DIST seamonkey-2.2_pre1-tr.xpi 805151 RMD160 7a9c1ec9eb889b922db47128b8d800a000d7205a SHA1 e4e7f5ad6443659c33efc548fff672d92ae40ede SHA256 30575edfe7e75acb2182398b32ba129a83b86e8377095f7067144a990f1015ef
-DIST seamonkey-2.2_pre1.source.tar.bz2 87479412 RMD160 711e616edf1168b81410cb6066d807fd02034c4d SHA1 0cc9dc0e5e6b46db8d350b9b3bb6fdfe7e819e47 SHA256 1041a4aea09007747f67ca97fafe0469a9dd1d7c25b422c308e8d62f7b16f96e
-DIST seamonkey-2.2b1-patches-01.tar.xz 17104 RMD160 d82c7d464be8bd3f593570529910bcb371797a6a SHA1 3c5584a1fe22a8cb5b69423499c32d25a0335606 SHA256 c4704e8959f65e02e6b10546de43c16cbbf57a28289a5f7e7084925439442278
-EBUILD seamonkey-2.2_beta3.ebuild 8743 RMD160 1764d37d93f90cc593fb299833a8290806eb8c6b SHA1 7d425dbed19653a0bce216dd9e486c5f3207c62b SHA256 7b3a33c1419bdb847d54d7c49193fcc58f0c0a354ca9cdc20c33e99b75a612a4
-EBUILD seamonkey-2.2_pre1.ebuild 8741 RMD160 c03698691cf4ad43615da86d7d16d2daa6e7165b SHA1 5b51c52499b8d96d2cc280fd8c50241981d6a7f7 SHA256 6ccb8a8c6712bec7a231cf7ecf2bd5f0fe0be9566ae68b287ba31c055281bbeb
+AUX seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch 3768 RMD160 48d6849a54d73054dde7f76e2e0aff4ebcd24926 SHA1 744f5d981e2219843ddba47341053ed74463ef11 SHA256 eed1c52b02b89d97328aa25b9c825d5b76d833bad87ce98f6fed5c32da91b5ac
+DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
+DIST seamonkey-2.4-patches-01.tar.xz 4752 RMD160 9c8fdaca8e77dde25f6d6db6a1af79e28884ce57 SHA1 360fa5f5fefa4eac5bccc6c8b1b29798099fa82a SHA256 6cd063d91143153ec697be99aa105e7bacf5ea5e91d3b4b9b47795989910b91e
+DIST seamonkey-2.5_beta1-be.xpi 796395 RMD160 d8a848b86a34ae0932934d896988d132b99fcefe SHA1 0329833d2c38fcb0b8b749a8a0e91d16a284a62f SHA256 ffa73bae41f4899463454176d01deea7a5d4a9b1848fde049763863f7974a2a2
+DIST seamonkey-2.5_beta1-ca.xpi 813814 RMD160 2dc29942157448b4f3c81c208eb6806f8c73e300 SHA1 dc7882e0f2b8df8f78d5055d5251d321c8b4818b SHA256 530fe0608e356ecd5811956c44d3eb01933205904b65295f26d98142951cd3fc
+DIST seamonkey-2.5_beta1-cs.xpi 819090 RMD160 0a6d19cd87715c18a703d2b14c5191cb59822cd1 SHA1 d250a4686264eaa27852bc1a0024750a8fb436c5 SHA256 1521dcb4644a1b676633dc0b5d418de59a15f65302f3857d2a5683ea543ddecf
+DIST seamonkey-2.5_beta1-de.xpi 859794 RMD160 c8c10736fa59e2ac574049f153b31ee73a8821e4 SHA1 8a0809c873b1a838783acf1665e47582737ec54e SHA256 cb1767abb92e9feafb8f8f7e37ae18e30983a191535dd8cb7f8fb85fe0e3d0c5
+DIST seamonkey-2.5_beta1-en-GB.xpi 789630 RMD160 5e8629addaa2223350a1ea20517923575906d621 SHA1 bc89ec58169a611f0578c70887baa3db1f734533 SHA256 908fadeeec780e1d37477d7e5caac77cd3ae08eba3b53ee8ce4c10954b992035
+DIST seamonkey-2.5_beta1-en-US.xpi 789287 RMD160 3fde465b96f20b6980db629037ee12463a748f39 SHA1 1b75aa385d700647b67274077ee2cb276d59b6cd SHA256 163e78370777a66770124c08ecd3badb722daba75b565fb5cf42eea4bdd31b7e
+DIST seamonkey-2.5_beta1-es-AR.xpi 860478 RMD160 6f3c6467e9cdba45a05d66b58769954fb26ac499 SHA1 59b2bbb9c35af07c1ed7e258ad854bb3ee83922a SHA256 5fc6c7d9477bdd161f7ceeb1222741f345e990a527e2808352910f6549dc0b63
+DIST seamonkey-2.5_beta1-es-ES.xpi 787408 RMD160 21e5039ec604f165b021a1a3499784ee33354d70 SHA1 1892c9166e2adac88ed3f966dc6c4e8d207e66c8 SHA256 2e90413432dca42cfbc786c19ae5df3d1486588228317edc3d7458cc09f70244
+DIST seamonkey-2.5_beta1-fi.xpi 809364 RMD160 f9e38be6ee6380a860299b37de3ff2fb7d3da594 SHA1 64859dcfd452fa48e029076104c821713c469800 SHA256 5ae4b1f007bae9dbf2d6b2d7564b44a9cef4dfdc5f325c361a763669649df608
+DIST seamonkey-2.5_beta1-fr.xpi 814852 RMD160 5309ade0b510997b7023f30fb63417c0786ab38a SHA1 daecef9fd3b00cd140963644a6574ee744fd5322 SHA256 5c9eff4c6a6e46b2b5143854de0cc1b20b735ee2019a7091b232d5ab766c6d0f
+DIST seamonkey-2.5_beta1-gl.xpi 809259 RMD160 116ce0aab1dec2f9f7e6c9bc4c336961d9198e27 SHA1 5867d422e44b1fd13ea4b12f00ebd2f2ce46c642 SHA256 3f8f4b00739d43bc73d475ee0b055b0db4e4ef31336604a09e2fe6416cacf82a
+DIST seamonkey-2.5_beta1-hu.xpi 831865 RMD160 7c9393fddffb80ad4f1ead56f0c8d576e176e5ee SHA1 4e962b5fa2e956e80f39c2b65510d1d18416da42 SHA256 89051d647174c139966e6d9382ece3acf9aa3ddc505b85640cba2873b4a48de3
+DIST seamonkey-2.5_beta1-it.xpi 737810 RMD160 6d12ab3362f59b2e422bfa4761a8d5723e0129b2 SHA1 44c9a9ed9d8c439289c9bc0588be7f69512d0437 SHA256 c6f2d74486afe003702a32fae0612d462e862d18007f33fd020f9efe95a7adbd
+DIST seamonkey-2.5_beta1-ja.xpi 864229 RMD160 000d0956e210d5dd98b6687036263737ad3e4b96 SHA1 fda8c79f013c23f26aedd10be992a447bb45e71b SHA256 3e0b4e71fa4f7eb2be8438aea7d4e072a78e798d662c83dcaf121a5e63183fda
+DIST seamonkey-2.5_beta1-lt.xpi 961779 RMD160 37209def21ead427d33af3ce00bfc4173c0b8945 SHA1 3d571e29f8e91503f5b2c025dd0cc4559f24a2ed SHA256 ae8d9d8e752443f017fd928bcdaebe6cf9be8be54b03934ef415b095792809db
+DIST seamonkey-2.5_beta1-nb-NO.xpi 807793 RMD160 ee2b1fc47910c1a2c085d1c4482ac78caecddb57 SHA1 dd6fc9e6670b556957184a0310c2e751f274dbec SHA256 aa683ac19da85ef129ad5d81b4017168f1930ce71f7ed0565df6f4d2bdd28ef7
+DIST seamonkey-2.5_beta1-nl.xpi 806319 RMD160 e8dba8d352f91193fe536e9c592364bf04742fa0 SHA1 95c66aba534ddedd75036254922b0d4b3d141b28 SHA256 71c98bede27714ec2ab932a34279672351ab6089148d7a3964f28b56b2101142
+DIST seamonkey-2.5_beta1-pl.xpi 829846 RMD160 aad31acfd36bd683228c37a20f59b5d673739913 SHA1 3ccfb23a3ee0d2aedc90f26aa6eae9046691af1d SHA256 af68ae2eb6217d4dbe0374de540c3f26d81d361a9d2b4b7e7722ad6ae3edf035
+DIST seamonkey-2.5_beta1-pt-PT.xpi 846037 RMD160 312a315242be79663dfc4de5da90b6201f37d424 SHA1 290ca94ec9787b39adb43788c165dc2aa14807fc SHA256 cd4f5def17f8aac89ffdb0cbc53756eefaf44431a27d58ab1cc44269bfd68323
+DIST seamonkey-2.5_beta1-ru.xpi 891481 RMD160 716117840237e7b133c038f3614ec11d38a37bdb SHA1 f4b9225e71bc62411c2b36c8220554c6d7a3ae7a SHA256 e0b0d8f891758e7bbf1b7ac9342ab2ebce45f6a3723919b58b8cfe6053f4ddf8
+DIST seamonkey-2.5_beta1-sk.xpi 842552 RMD160 3f304d436c2b23fe5a292286df66815fe35a90a6 SHA1 0b595527492d570d633d36ba7dd7ecc0d39dc3e9 SHA256 70572dfc3cef159ac974d73ba4ea322a3c8fddc1043bfc7d3ec4d74c67e6e317
+DIST seamonkey-2.5_beta1-sv-SE.xpi 871535 RMD160 2b83ea2c69759805e75cab3686f344db3c749605 SHA1 d2134f19911ff949d67fd6f13ba4670b9f7c2e3b SHA256 b3f88fa746c36f224f87cd87b631cd10a3c89e567d5c8dc6c6d8784a02bbc106
+DIST seamonkey-2.5_beta1-tr.xpi 808421 RMD160 efc7c0c544bd3205c9f0942f4f1bd350c914ee3b SHA1 7ddb38d86cb5f049971691295b03250a388e17e5 SHA256 570051e945be048b0ed5f2e6ff264309810c3711841660e9445d00ffc09d98e5
+DIST seamonkey-2.5_beta1-zh-CN.xpi 837986 RMD160 56c6c4bb963bfe55123d82eba4868c42cef93cf2 SHA1 cd67b9b9317534c9e4f8084d492979228e844ab4 SHA256 1abbf13929e0ffadae2d357f2c66b50448ecc6d30b8148a296933ddb086e4bc1
+DIST seamonkey-2.5_beta1.source.tar.bz2 89806691 RMD160 5d75528b45f2b6d5a6e1088b9d585479fb0b8f93 SHA1 a38b9a8f1c8095ab4f6e8b6ee0d3ee2ada11d2b5 SHA256 7e9903340722c7ff3211d0afaa561ba7f0ffefacd351adf6c976887c00122aff
+EBUILD seamonkey-2.5_beta1.ebuild 9843 RMD160 c043c157041d11211b6976b76d8d766819f31e84 SHA1 6ff9c89ae0d549a7028cbbf49dac4cf769cee2d2 SHA256 5cfe60d376df9b115cf20c4e46d6c1a215a2efa26d368d59f40d0ad0d6b48c7b
diff --git a/www-client/seamonkey/files/all-gentoo.js b/www-client/seamonkey/files/all-gentoo.js
index 6e7fb74..2969dc5 100644
--- a/www-client/seamonkey/files/all-gentoo.js
+++ b/www-client/seamonkey/files/all-gentoo.js
@@ -13,4 +13,3 @@ pref("browser.backspace_action", 0);
pref("accessibility.typeaheadfind", true);
pref("browser.EULA.override", true);
pref("intl.locale.matchOS", true);
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
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
deleted file mode 100644
index 91524aa..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/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
deleted file mode 100644
index 2696764..0000000
--- a/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-# This patch reverts the change from
-# https://bugzilla.mozilla.org/show_bug.cgi?id=643294
-
---- comm-2.0/suite/browser/tabbrowser.xml
-+++ comm-2.0/suite/browser/tabbrowser.xml
-@@ -3000,7 +3000,7 @@
-
- <destructor>
- <![CDATA[
-- window.removeEventListener("resize", this, false);
-+ document.removeEventListener("resize", this, false);
- ]]>
- </destructor>
-
-@@ -3123,13 +3123,6 @@
- this._handleNewTab(event.target);
- ]]>
- </handler>
--
-- <handler event="DOMMouseScroll" phase="capturing">
-- <![CDATA[
-- this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
-- event.stopPropagation();
-- ]]>
-- </handler>
- </handlers>
- </binding>
-
diff --git a/www-client/seamonkey/files/seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch b/www-client/seamonkey/files/seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch
new file mode 100644
index 0000000..64da373
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch
@@ -0,0 +1,105 @@
+# HG changeset patch
+# User Philip Chee <philip.chee@gmail.com>
+# Date 1314371784 -28800
+# Node ID bce6138fb07449887e0e791965f90af87c28ca98
+# Parent a11ec626d4ab7088f8d9753e8fec90197e6b899b
+Bug 673878 Use SHIFT+DOMMouseScroll to advance the selected tab.
+This will allow plain DOMMouseScroll to scroll the tabbar without changing the selected tab.
+
+diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js
+--- a/suite/browser/browser-prefs.js
++++ b/suite/browser/browser-prefs.js
+@@ -279,16 +279,21 @@ pref("browser.tabs.tabClipWidth", 140);
+
+ // Where to show tab close buttons:
+ // 0 on active tab only
+ // 1 on all tabs until tabClipWidth is reached, then active tab only
+ // 2 no close buttons at all
+ // 3 at the end of the tabstrip
+ pref("browser.tabs.closeButtons", 3);
+
++// Mouse wheel action when over the tab bar:
++// false The mouse wheel scrolls the whole tab bar like Firefox (default).
++// true The mouse wheel advances the selected tab.
++pref("browser.tabs.mouseScrollAdvance", false);
++
+ // lets new tab/window load something different than first window
+ // -1 - use navigator startup preference
+ // 0 - loads blank page
+ // 1 - loads home page
+ // 2 - loads last page visited
+ pref("browser.tabs.loadOnNewTab", 0);
+ pref("browser.windows.loadOnNewWindow", 1);
+
+diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
+--- a/suite/browser/tabbrowser.xml
++++ b/suite/browser/tabbrowser.xml
+@@ -2999,16 +2999,17 @@
+ <constructor>
+ <![CDATA[
+ var tab = this.firstChild;
+ // set the tabstrip's minWidth too, otherwise it immediately overflows
+ this.mTabstrip.style.minWidth =
+ tab.style.minWidth = this.mPrefs.getIntPref("browser.tabs.tabMinWidth") + "px";
+ tab.style.maxWidth = this.mPrefs.getIntPref("browser.tabs.tabMaxWidth") + "px";
+ window.addEventListener("resize", this, false);
++ this.mScrollSelectedTab = this.mPrefs.getBoolPref("browser.tabs.mouseScrollAdvance");
+ ]]>
+ </constructor>
+
+ <destructor>
+ <![CDATA[
+ window.removeEventListener("resize", this, false);
+ ]]>
+ </destructor>
+@@ -3116,32 +3117,48 @@
+ * if a tab was inserted to the overflow area or removed from it
+ * without any scrolling and when the tabbar has already
+ * overflowed.
+ */
+ this.mTabstrip._updateScrollButtonsDisabledState();
+ ]]>
+ </body>
+ </method>
++
++ <field name="mScrollSelectedTab">
++ false
++ </field>
++
++ <method name="_handleMouseScroll">
++ <parameter name="aEvent"/>
++ <body>
++ <![CDATA[
++ // Javascript does not have a logical XOR operator.
++ if (aEvent.shiftKey != this.mScrollSelectedTab) {
++ this.advanceSelectedTab(aEvent.detail < 0 ? -1 : 1);
++ aEvent.stopPropagation();
++ }
++ ]]>
++ </body>
++ </method>
+ </implementation>
+
+ <handlers>
+ <handler event="TabSelect" action="this._handleTabSelect();"/>
+
+ <handler event="transitionend">
+ <![CDATA[
+ if (event.propertyName == "max-width")
+ this._handleNewTab(event.target);
+ ]]>
+ </handler>
+
+ <handler event="DOMMouseScroll" phase="capturing">
+ <![CDATA[
+- this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
+- event.stopPropagation();
++ this._handleMouseScroll(event);
+ ]]>
+ </handler>
+ </handlers>
+ </binding>
+
+ <binding id="tabbrowser-alltabs-popup"
+ extends="chrome://global/content/bindings/popup.xml#popup">
+ <implementation implements="nsIDOMEventListener">
diff --git a/www-client/seamonkey/seamonkey-2.2_beta3.ebuild b/www-client/seamonkey/seamonkey-2.2_beta3.ebuild
deleted file mode 100644
index 4d8363c..0000000
--- a/www-client/seamonkey/seamonkey-2.2_beta3.ebuild
+++ /dev/null
@@ -1,311 +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.2b1-patches-01"
-EMVER="1.2"
-
-LANGS="ca cs de en en-GB en-US es-AR es-ES fi fr hu it ja lt nb-NO nl pl 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 ~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}"
- LANG_URI="${REL_URI}/langpack"
- 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 -> ${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"
-
-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
- webm? ( amd64? ( ${ASM_DEPEND} )
- x86? ( ${ASM_DEPEND} ) )"
-
-S="${WORKDIR}/comm-beta"
-
-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
-}
-
-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 '' --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}"/"${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_pre1.ebuild b/www-client/seamonkey/seamonkey-2.5_beta1.ebuild
similarity index 80%
rename from www-client/seamonkey/seamonkey-2.2_pre1.ebuild
rename to www-client/seamonkey/seamonkey-2.5_beta1.ebuild
index 49545df..b1e4bdd 100644
--- a/www-client/seamonkey/seamonkey-2.2_pre1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.5_beta1.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.4.1.ebuild,v 1.1 2011/09/30 21:33:19 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.2b1-patches-01"
-EMVER="1.2"
+PATCH="${PN}-2.4-patches-01"
+EMVER="1.3.2"
-LANGS="ca cs de en en-GB en-US es-AR es-ES fi fr hu it ja lt nl pl pt-PT ru sk sv-SE tr"
+LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
NOSHORTLANGS="en-GB en-US es-AR"
MY_PV="${PV/_pre*}"
@@ -32,14 +32,15 @@ if [[ ${PV} == *_pre* ]] ; then
LANGPACK_PREFIX=""
LANGPACK_SUFFIX=""
#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.
- REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
+ #REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
+ REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
LANG_URI="${REL_URI}/langpack"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
fi
@@ -48,7 +49,7 @@ HOMEPAGE="http://www.seamonkey-project.org"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +crypt gconf +roaming +webm"
+IUSE="+alsa +chatzilla +crypt +ipc +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
@@ -74,11 +75,18 @@ 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/nss-3.12.10
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/glib-2.26
+ >=media-libs/mesa-7.10
>=media-libs/libpng-1.4.1[apng]
- gconf? ( >=gnome-base/gconf-1.2.1:2 )
+ >=x11-libs/cairo-1.10
+ >=x11-libs/pango-1.14.0
+ >=x11-libs/gtk+-2.14
+ virtual/libffi
+ system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
crypt? ( >=app-crypt/gnupg-1.4 )
webm? ( media-libs/libvpx
media-libs/alsa-lib )"
@@ -88,7 +96,11 @@ DEPEND="${RDEPEND}
webm? ( amd64? ( ${ASM_DEPEND} )
x86? ( ${ASM_DEPEND} ) )"
-S="${WORKDIR}/comm-beta"
+if [[ ${PV} == *beta* ]] ; then
+ S="${WORKDIR}/comm-beta"
+else
+ S="${WORKDIR}/comm-release"
+fi
linguas() {
local LANG SLANG
@@ -135,15 +147,36 @@ pkg_setup() {
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 "${WORKDIR}/_seamonkey"
- epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
+ # browser patches go here
+ pushd "${S}"/mozilla &>/dev/null || die
+ EPATCH_EXCLUDE="5006_use_system_libffi.patch" \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/_mozilla"
+ popd &>/dev/null || die
+
+ # mailnews patches go here
+ #pushd "${S}"/mailnews &>/dev/null || die
+ #EPATCH_SUFFIX="patch" \
+ #EPATCH_FORCE="yes" \
+ #epatch "${WORKDIR}/_mailnews"
+ #popd &>/dev/null || die
+
+ epatch "${FILESDIR}"/${PN}-2.3.1-scrollbar-mouse-interaction-improvement.patch
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -151,7 +184,6 @@ src_prepare() {
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
@@ -197,11 +229,13 @@ src_configure() {
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 gconf
+ mozconfig_use_enable system-sqlite
+ mozconfig_use_enable methodjit
if use crypt ; then
mozconfig_annotate "mail crypt" --enable-chrome-format=jar
@@ -214,6 +248,10 @@ src_configure() {
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
####################################
@@ -229,7 +267,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.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, profiles/, www-client/seamonkey/, ...
@ 2011-12-04 1:10 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2011-12-04 1:10 UTC (permalink / raw
To: gentoo-commits
commit: ad641f5471bbb71209e05baac6970430f8444453
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 4 01:09:42 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 01:09:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=ad641f54
seamonkey: New beta release.
---
profiles/package.mask | 2 +-
www-client/seamonkey/Manifest | 56 ++++++------
.../files/enigmail/enigmail-1.3.3-bug373733.patch | 20 ++++
.../seamonkey/files/seamonkey-2.6b1-bug682677.diff | 71 ++++++++++++++
...2.5_beta4.ebuild => seamonkey-2.6_beta2.ebuild} | 99 ++++++++++----------
5 files changed, 171 insertions(+), 77 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 134b0d8..d48e838 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -6,5 +6,5 @@
#
# These are experimental use with caution!!
->=www-client/seamonkey-2.5_beta1
+=www-client/seamonkey-2.6_beta*
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index cd00d73..0e3a485 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,32 +1,34 @@
AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b
+AUX enigmail/enigmail-1.3.3-bug373733.patch 1168 RMD160 296a154bb79945a763f922149eb68667c4b51343 SHA1 52f5ec3cc1818eaa45a689200e4a84c7c599e377 SHA256 c8a61a29164e66a47c2d12ec96c3c31a6b3019f3fd3b961584642fdde228b379
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.3.1-scrollbar-mouse-interaction-improvement.patch 3768 RMD160 48d6849a54d73054dde7f76e2e0aff4ebcd24926 SHA1 744f5d981e2219843ddba47341053ed74463ef11 SHA256 eed1c52b02b89d97328aa25b9c825d5b76d833bad87ce98f6fed5c32da91b5ac
+AUX seamonkey-2.6b1-bug682677.diff 2317 RMD160 b45155ae8a81ea8014b3844af50c223ca2b3756b SHA1 6914ce260d12318659bf1c4a83ca2e915d16d3c7 SHA256 f79675ebcc555c2e42f7c10e17dd79863968435c0d2bca064e40f315bfc19f88
DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0eea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6
-DIST seamonkey-2.4.1-patches-01.tar.xz 15108 RMD160 cacdc06de2c3d76ff4ae85f8cc3e13a25d8f1ac5 SHA1 518d1df4bad0e28f1d3bdfcb7deb1b4c3cc960dc SHA256 8713bdad0f5523e32abd80292da4759c0664fb24f3ec56cc523d8b104e701306
-DIST seamonkey-2.5_beta4-be.xpi 795233 RMD160 1ccef5ea0eee9dd4234bc4dc3c187c69e388722d SHA1 9135fb90c9f3d12291a711a582db3d147ac17dbe SHA256 0beec11e97474981822c0b4f2e36921f8db800d4ad4ddea6876da30756984877
-DIST seamonkey-2.5_beta4-ca.xpi 813814 RMD160 531ba953ae5fa511358f7030be481d0d231b3576 SHA1 e359589bb3a9434f22bcc22953c183a4823af9ff SHA256 5b9d767cb95961d5c7cf4e2a69a1f20bb3ab2fc2483362a81f8729ee98b482e6
-DIST seamonkey-2.5_beta4-cs.xpi 819090 RMD160 dc07d055f56e519f312fa5cb969ccd4284a31ed5 SHA1 89b98acab14662da728e22fe6a03898a5ed065c4 SHA256 74dfb6ff94da82e2ef631703c25f16319dd84aa6ba4b3ed57224f6388bb6128d
-DIST seamonkey-2.5_beta4-de.xpi 859869 RMD160 062bad21f206d7e5e700b8dcd2a27566dd5957cb SHA1 17bbf950a8fd6ae8966d9ee5fd5596a1fbebfde8 SHA256 65c49587af591be118fbf44a6aebf93d818f8361e6cea95c2fbab87a0dbafffb
-DIST seamonkey-2.5_beta4-en-GB.xpi 789630 RMD160 ca8e08bad2abdbf2b572e8b4333a2b3bc1ae62fb SHA1 c558b0fb79c2a8cbe8e40a0f397e076fb2f717d9 SHA256 bde7ebb62e659911cc495716cd30a8ce658278588b2f69093e17318a9133e10c
-DIST seamonkey-2.5_beta4-en-US.xpi 789287 RMD160 918fa5ed589d34d5f1ff6563c1cacf347035beef SHA1 d3afc135e207525416378f990f66515cc4df9393 SHA256 d1a08709d580b6d56f8d4459af3180399f5ab2c331cfc27a96dc0f1a627f6399
-DIST seamonkey-2.5_beta4-es-AR.xpi 859119 RMD160 e8e75593cd06c67c16477d4ee4003231c094c770 SHA1 463388c40066e30395a2ead76c4d0a5254261b34 SHA256 1842ed3ed46591488cc921ca28bdb55c7849aa3dc87bd2a43fcb655f01088de8
-DIST seamonkey-2.5_beta4-es-ES.xpi 787408 RMD160 964101581fe93c2cee6513d4f9e3fc20635df51c SHA1 525c889ae19a0712009c993270414695b72cce88 SHA256 09ae7cbcba34d507286109f688b54b0782dabd2781581b6990d0eeb33a24d27f
-DIST seamonkey-2.5_beta4-fi.xpi 809364 RMD160 0119d54687d7509b792f242af7f5ab52cb61c314 SHA1 919e764bd5c58f538e0d9b87c3244e1edb76d003 SHA256 7b98f9e19d1a945b340d050dd37e0d6477ee5bdfc49ffef2edd7b9f558864a9b
-DIST seamonkey-2.5_beta4-fr.xpi 814852 RMD160 38f3c152b6cc05ef8ccecc8a475e732392fc799b SHA1 4522ea03cbdf48e805d3248f1505cf70c7e13057 SHA256 995133aeb091a81dd30b0b49e51f8c93ca778c2d3c5e2a2ef8184dbf0c233f69
-DIST seamonkey-2.5_beta4-gl.xpi 809259 RMD160 9b46f5ee144d1b707e2ef242ca9aa897948f0295 SHA1 891e389fdcb8beab7f5ce708685b20096467eb65 SHA256 6e4a9341532d4917df73291f0d8c628eb2468305d7948d80128849d1db336ca9
-DIST seamonkey-2.5_beta4-hu.xpi 830898 RMD160 b545b963e28bcc6330d239bb30ac952ee17e6072 SHA1 347cbad7bb31510c8b269f6d6064164a8a43cce3 SHA256 94c626ada163bf04d1f3b830e1eac5551a185026254f44acca1c9e439e696647
-DIST seamonkey-2.5_beta4-it.xpi 737810 RMD160 3decebf3d008011e3c19641d8bef727b9b60dcf7 SHA1 635243d4d50342b4495fbd3f5e200c9bc1048e26 SHA256 4af6b23f9ec9204634cd2cdc1f75d0e6e2e02db2b3778bcdb17356767d85e388
-DIST seamonkey-2.5_beta4-ja.xpi 864233 RMD160 cc807188009f2102cc0476f41e3cb23af522f4c4 SHA1 7b8ed468e218793474d0a11cd068a3f9a4eb53e7 SHA256 2769357425343740abc7a9caacd2f7c134167ec0de9c51bc3b06611d63587efe
-DIST seamonkey-2.5_beta4-lt.xpi 961779 RMD160 d0b8999698e52e7907aa99b96cb24fc324b36c64 SHA1 f7080af6880bd62c4ffa2e449a61aaf5871abe5c SHA256 2722ba4503f11fa54a8ddfa8081abafe0e9b943300621bbdc1146e018fb8babe
-DIST seamonkey-2.5_beta4-nb-NO.xpi 807765 RMD160 54c60825f4e85c255d0656e15fb81e075374ad9d SHA1 d680247ce5dfe938e42d1f27733c8fc816e474af SHA256 e8383031aced1be6d35e5946318fabe3a26d3830d9082f9d4e0d0139d2f03daa
-DIST seamonkey-2.5_beta4-nl.xpi 806319 RMD160 7c09fac0ce23d393f5bce1c69704e0ab6562dad4 SHA1 1f148aaa92a7901732a8a9fd3048ad04222123b7 SHA256 18f17bfb37fc2d26e3bc9a31b96d5ff9b78f70952e856983e136af2d2aab9d70
-DIST seamonkey-2.5_beta4-pl.xpi 828798 RMD160 46cd8b0f2395f536e9ebb38f0e3a727ad023233b SHA1 3f25ca3ce8deafd2bbe03777f9b4afd3c93f3a67 SHA256 12a612b035e9943edbb08a0ace757cc72222fec029b83a80ee17a32c6d4bc873
-DIST seamonkey-2.5_beta4-pt-PT.xpi 844864 RMD160 b90465d85aa81b95884f770f57a81a19cc5cf37f SHA1 3100046446e101b463d609b29abdd7335e97b82c SHA256 642e59c498cafe1688af791ba258e7c0e6e683c9f50529ac95bacc4048837014
-DIST seamonkey-2.5_beta4-ru.xpi 891481 RMD160 5b8776e739401d3f6f45fe9ae97920fe9cec78f0 SHA1 9a43d8d75dff84bea7894532e347a970d30359eb SHA256 adf77c057d3a55a7c2173657611825a29664a9111a20d86deeb6f061b15852ce
-DIST seamonkey-2.5_beta4-sk.xpi 842552 RMD160 390e4e97f0ffa4ad8bbd45525a7b989fdc5168f5 SHA1 53b88dc0a45797a0a230234cdc3c0327e50096d0 SHA256 ae4772ad07cc93671f2c52c90fe80641fd9dab7f92abfb0bf9420338126ac0a5
-DIST seamonkey-2.5_beta4-sv-SE.xpi 871535 RMD160 6a0a7eeee3a7054b7989f1ffa853d8d0d88cf29f SHA1 74b52569436cf0d7bac7111b4d78ffd317d9b206 SHA256 7e1cd38bdebfbf32ffabd421b48170e624058f416be29268eee05549709450fc
-DIST seamonkey-2.5_beta4-tr.xpi 807205 RMD160 541bac93d2a5310594f40e4bf28af68dc402d05e SHA1 07e4695723b2852c9463a95843bc93cf38d87f57 SHA256 0c0a655ea10bcf9b86d25d9b58c9a8cae7fdae191c02fb63359d8f2fc14b9902
-DIST seamonkey-2.5_beta4-zh-CN.xpi 837986 RMD160 6f45ba71684339b3c2de6db5413934e1ad56e687 SHA1 e63de8518475adf66b1b938a0cad7faca0879e21 SHA256 75952433c1268f3b0b8f363be774ed17f747b6dd7b7103df48c373343c2a0525
-DIST seamonkey-2.5_beta4.source.tar.bz2 89481907 RMD160 1ed9a59457b7bafe2aed2071908822b98225dddc SHA1 74b8b9a415b97e4e3242db516fa57ed8b9f43dfe SHA256 10031a49b84542641bc93b40c3e8c3a56dd3aee90db47b49880ec1d100302231
-EBUILD seamonkey-2.5_beta4.ebuild 10099 RMD160 d3ffeaf1ebb53a65f763cb57ca964f5177386ed3 SHA1 d3d7e30a455669e04be29aeb50e1fec30fa7eb96 SHA256 aa8952368cf901bd9b1e204043143d2e3b4bf94c4a56c03b0bd1bf6545cf77c8
+DIST seamonkey-2.5-patches-01.tar.xz 8576 RMD160 c0c69f031497211616e73b571968ce6892e1f718 SHA1 70fe20e3925286c91a1083495b404bea0d02bff0 SHA256 47f6e1f8a6aba1747bd67ffb7253c71c10734becf5047e0329f566f39bf9f33c
+DIST seamonkey-2.6_beta2-be.xpi 796444 RMD160 e63bf35f7961632a88b4cd6049357aeafea58b3e SHA1 13847c390c1cea8d121149af2c314017e018b535 SHA256 20b9f17090ca9eb07530163b2cdd62326246c28b4b3ad9a01d4db52c8e9e38ae
+DIST seamonkey-2.6_beta2-ca.xpi 814466 RMD160 8fcd5acf074da3381a38183fb2bfc13b70a13a23 SHA1 2cf0cd5b3641fd5765f80f9928660c7268a5574d SHA256 76583f6759d53edb4ef67328a2ecbc4a297112d1488684585774b4e73b6e73a3
+DIST seamonkey-2.6_beta2-cs.xpi 819661 RMD160 fa4505e26dc6fd74fd368337ae4f632fa483578f SHA1 9f3022ec40a78a9299bd094900d54a3e32dfdc00 SHA256 c8f090b1765ed9a15071adb948f2d74417b31fcd9655799eb66f7ebf7765d175
+DIST seamonkey-2.6_beta2-de.xpi 860353 RMD160 6757eb51cc69d37a0418f8f3536eb5f7ee6c22c9 SHA1 0147372e04e541c0027deabe74ea2292986df574 SHA256 d6dbb20394067d6d5aeb14c63a20c727bdfa30f1a97e31ca49f07e8c692ccf0b
+DIST seamonkey-2.6_beta2-en-GB.xpi 790667 RMD160 09411e7fd31bc560c3bba834b259570377653cb2 SHA1 190d9081d921d4ad668dcce321c9ed26eacbf32e SHA256 2e00e63712bbc152e9c31959580718adb3106fd7503855d71272ccc087a9f544
+DIST seamonkey-2.6_beta2-en-US.xpi 789695 RMD160 bc700f3378b0954ec278b0e2ce308a08e0470265 SHA1 dbcbf7fb4e7de07ed09b456a1aa2dcdb30976091 SHA256 905556dffdceb45d00a144991dae7b9373711bab2101878fcc09cd5e867b90d8
+DIST seamonkey-2.6_beta2-es-AR.xpi 859632 RMD160 02084894c51780407cdc5940aee6fe51e127202f SHA1 7319ac84af2efb78eff274e16cca356ac0c7a388 SHA256 7a9a58a80f2442d714a7051cca63e8ec0c5fe2abb4963083b6d1e66581bd376f
+DIST seamonkey-2.6_beta2-es-ES.xpi 788484 RMD160 d865961583fb410562f11fae35c999892e5b6190 SHA1 3176b5018ac390ae73d828ee7630acc67b4da128 SHA256 73a256fcf6dfccb99ed5bfc3b5c154d838a57054ef3896af4fd1d89ca914e49d
+DIST seamonkey-2.6_beta2-fi.xpi 809900 RMD160 f8a7d8c3e51b99efce3bd33782ebc84631fa55ad SHA1 1618529a33314d8d78a1c9ade76cc4b98b39da10 SHA256 38df8fb3e4def9975bfc363329aaf67cd5093e78286f757d1b245a5829af615c
+DIST seamonkey-2.6_beta2-fr.xpi 815676 RMD160 4029c02e7f890216e797ae562bdfed57ef9ec38e SHA1 b74bb4f37d1d78a695c077730dc414028b80b2ce SHA256 745da3a9d85f2842023d33d9ce412c753016917efedf1e9c81cce6d899d712bb
+DIST seamonkey-2.6_beta2-gl.xpi 809736 RMD160 fd3835054aa9fb97f3cb712a42e3eed0f1d607c6 SHA1 bdc89e64a04c976105ec28e7ea928c2319d99122 SHA256 aed835a165d0b8b405596db78ab4b7509aac727a5ac7ae5115ae5f688e254c0b
+DIST seamonkey-2.6_beta2-hu.xpi 832650 RMD160 a764f1240d930d1ad7a2ec43f666686475137a6b SHA1 028b184db2263edbacf939c869bc6674c4529bfd SHA256 20b3cf0d06bb60e12219e485f6ef9de69f7463272bb1f3ee7eb603e230e000c7
+DIST seamonkey-2.6_beta2-it.xpi 738878 RMD160 accdb2a07f65830a332829f68a53ac114a0a3166 SHA1 12f343d27424ce96239390665259e701f4440bca SHA256 d3c87fd961d4fbda29e39f94d21a84981b327018644f4994383953b8d74e808a
+DIST seamonkey-2.6_beta2-ja.xpi 864873 RMD160 92a3252ddd900bb2b3d990cb7721737e106ed116 SHA1 749e552f9e4f6813e6c900c1a04f987f03799c89 SHA256 d1e72c59e8201c37160d3ce882cb06c5c6afc77c97d1be2cd272bd30ef4e5a3b
+DIST seamonkey-2.6_beta2-lt.xpi 962667 RMD160 e4c5fa21625d22f97366b8cc77157b2d0a921c9d SHA1 78a30fc886e8623c7f4001a67c946641df2379e2 SHA256 f7e7e1ba8865241d7f6424d512ca80b951dbd2a3a1bdc63e3fc2718f8dd9b6dd
+DIST seamonkey-2.6_beta2-nb-NO.xpi 808226 RMD160 87fcca3d585a43879e52e8763fb57784e10fe455 SHA1 d69451c562ffd6b9b1d4772918397acaed704dc3 SHA256 5cdcfd72d4b6c632c573652f9b2fc4e7b44f9883f5062c2657612261ad65ce17
+DIST seamonkey-2.6_beta2-nl.xpi 806819 RMD160 639441fabfd61f13c2348be003e45f2b299003af SHA1 9a1f8c8c5cf368ba6580bf5ad1b2231656a529bb SHA256 5488dbc6a8afe826c32a60100572b284a87f955b2146dcda224da71b7005c307
+DIST seamonkey-2.6_beta2-pl.xpi 829357 RMD160 a7bdbad0bb33d2da4aeb1d9a7800573874d6d309 SHA1 35e82f6bbee4d68c0adb749dd3580dab229724f5 SHA256 b8f035905655404a18134db8f1931f619ff8edc921e961b984e29a856a0648e4
+DIST seamonkey-2.6_beta2-pt-PT.xpi 845392 RMD160 7ab92610f6b9eb90514b9666220763667b60ff6e SHA1 392120b79172c88223050d5bceb6b2421d8b6866 SHA256 90898ac7109c116c10df6de1607602fbe3bb72ecf96554c228a583a3d44a8884
+DIST seamonkey-2.6_beta2-ru.xpi 892794 RMD160 b8a6951f8a452f1911694c5c87ce321efa8950c7 SHA1 480dc8336529d4c5b6411ce6db603a6bf6237883 SHA256 c802a31aa172a14f2a130c19fbb612879e1f2dfe3206e74b76bfdce967dfc41a
+DIST seamonkey-2.6_beta2-sk.xpi 843098 RMD160 cb86858dc51b45c3b0c50b9bdd6824f9e4a92627 SHA1 cc88762455e8811f1a3158c177a81d6c1f2dd091 SHA256 c36301cdd6549bc6a7c57277965d969aa3f27901b8b0684745bf25e8a8c53bef
+DIST seamonkey-2.6_beta2-sv-SE.xpi 872017 RMD160 28ec5017fe686921ac7dffa7bef3d62e1463308d SHA1 1a8e4569e8ab07b9e52dda0c307c868d985ae7c2 SHA256 d56b9bf6aa21f9c2c19f46c1a656d79872a238089f8022f6ff1f352e06c2d3c2
+DIST seamonkey-2.6_beta2-tr.xpi 809260 RMD160 f0eea72384662d4495e949142e17b01d156e5ce8 SHA1 2fcf1726753095dd563f48c7b2550b16711c1aef SHA256 e460e33715f01c787a1649e05e758072176e8916055ca4e8522c2922c318eee2
+DIST seamonkey-2.6_beta2-zh-CN.xpi 838638 RMD160 75ecca74f98bf7ba224d5fafcd41927ba2970b8d SHA1 a7086c5930492fc5cd920b37c47f1006faa8d324 SHA256 df36bdf15a3e39a3b20194996adf873ad9e1fedb2d3bcc7fac98ff668a1f8a63
+DIST seamonkey-2.6_beta2.source.tar.bz2 96531073 RMD160 974a7a1dcc8f7f75da5246fe03d11d3a1f9d9f6e SHA1 3225aa07ae202e0cb1741c3f2c26760fda5625a1 SHA256 2c04f03e8076efdbbb5fa060f5e4fa8b15ee821879ac62dce9c6ba42c5a3bc11
+EBUILD seamonkey-2.6_beta2.ebuild 10138 RMD160 d05244c4f61179a970db8bfcd0dcb1987708cf92 SHA1 38c2efe880b2f873538ef75271b1b99db338cd5d SHA256 1250b743e5d4e2372061444c84e2a5865229e2d5d089e329211968e66bae8fb4
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch b/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
new file mode 100644
index 0000000..2b8d6d9
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
@@ -0,0 +1,20 @@
+--- a/mailnews/extensions/enigmail/package/enigmail.js 2011-09-19 10:46:49.000000000 -0500
++++ b/mailnews/extensions/enigmail/package/enigmail.js 2011-11-11 06:30:21.000000000 -0600
+@@ -924,7 +924,7 @@
+ Components.classes["@mozilla.org/file/directory_service;1"].
+ getService(Components.interfaces.nsIProperties);
+
+- var extensionLoc = directoryService.get("ProfD", Components.interfaces.nsIFile);
++ var extensionLoc = directoryService.get("CurProcD", Components.interfaces.nsIFile);
+ extensionLoc.append("extensions");
+ extensionLoc.append(ENIGMAIL_EXTENSION_ID);
+ extensionLoc.append("wrappers");
+@@ -1460,7 +1460,7 @@
+ Components.classes["@mozilla.org/file/directory_service;1"].
+ getService(Components.interfaces.nsIProperties);
+ var extensionLoc =
+- directoryService.get("ProfD", Components.interfaces.nsIFile);
++ directoryService.get("CurProcD", Components.interfaces.nsIFile);
+ extensionLoc.append("extensions");
+ extensionLoc.append(ENIGMAIL_EXTENSION_ID);
+ extensionLoc.append("wrappers");
diff --git a/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff b/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff
new file mode 100644
index 0000000..29f085b
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff
@@ -0,0 +1,71 @@
+Mozilla Bug 682677 - Eliminated direct access to mInfo->pixel_depth, which is not allowed in libpng15. We access pixel_depth via png_get_IHDR() instead; r=joedrew
+
+--- comm-beta/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
++++ comm-beta/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
+@@ -380,18 +380,17 @@
+ return;
+ }
+ mPos += aCount;
+ aBuffer += aCount;
+ aCount = 0;
+
+ // Raymond Chen says that 32bpp only are valid PNG ICOs
+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
+- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() &&
+- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
++ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
+ PostDataError();
+ }
+ return;
+ }
+
+ // We've processed all of the icon dir entries and are within the
+ // bitmap info size
+ if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset &&
+--- comm-beta/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
++++ comm-beta/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
+@@ -69,28 +69,35 @@
+ void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
+ PRInt32 width, PRInt32 height,
+ gfxASurface::gfxImageFormat format);
+ void SetAnimFrameInfo();
+
+ void EndImageFrame();
+
+ // Checks if the info header contains valid information
+- bool HasValidInfo() const
++ // Check if PNG is valid ICO (32bpp RGBA)
++ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
++ bool IsValidICO() const
+ {
+- return mInfo && mInfo->valid;
+- }
++ png_uint_32
++ png_width, // Unused
++ png_height; // Unused
+
+- // Obtain the pixel depth if available or 0 otherwise
+- PRInt32 GetPixelDepth() const
+- {
+- if (!mInfo) {
+- return 0;
++ int png_bit_depth,
++ png_color_type;
++
++ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
++ &png_color_type, NULL, NULL, NULL)) {
++
++ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
++ png_bit_depth == 8);
++ } else {
++ return false;
+ }
+- return mInfo->pixel_depth;
+ }
+
+ public:
+ png_structp mPNG;
+ png_infop mInfo;
+ nsIntRect mFrameRect;
+ PRUint8 *mCMSLine;
+ PRUint8 *interlacebuf;
diff --git a/www-client/seamonkey/seamonkey-2.5_beta4.ebuild b/www-client/seamonkey/seamonkey-2.6_beta2.ebuild
similarity index 77%
rename from www-client/seamonkey/seamonkey-2.5_beta4.ebuild
rename to www-client/seamonkey/seamonkey-2.6_beta2.ebuild
index 912b4d9..991bd74 100644
--- a/www-client/seamonkey/seamonkey-2.5_beta4.ebuild
+++ b/www-client/seamonkey/seamonkey-2.6_beta2.ebuild
@@ -1,18 +1,15 @@
# 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.4.1.ebuild,v 1.1 2011/09/30 21:33:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.5.ebuild,v 1.2 2011/11/23 22:59:52 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 nsplugins
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python nsplugins
-PATCH="${PN}-2.4.1-patches-01"
+PATCH="${PN}-2.5-patches-01"
EMVER="1.3.3"
-LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
-NOSHORTLANGS="en-GB en-US es-AR"
-
MY_PV="${PV/_pre*}"
MY_PV="${MY_PV/_alpha/a}"
MY_PV="${MY_PV/_beta/b}"
@@ -32,7 +29,7 @@ if [[ ${PV} == *_pre* ]] ; then
LANGPACK_PREFIX=""
LANGPACK_SUFFIX=""
#KEYWORDS=""
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
#HAS_LANGS="false"
else
# This is where arch teams should change the KEYWORDS.
@@ -40,7 +37,7 @@ else
#REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
LANG_URI="${REL_URI}/langpack"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
fi
@@ -56,19 +53,22 @@ SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
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}
+ LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt
+ nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
+
+ for X in "${LANGS[@]}" ; do
+ # en is handled internally
+ if [[ ${X} != en ]] ; then
+ 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%%-*}"
+ IUSE+=" linguas_${X/-/_}"
+ # Install all the specific locale xpis if there's no generic locale xpi
+ # Example: there's no pt.xpi, so install all pt-*.xpi
+ if ! has ${X%%-*} "${LANGS[@]}"; then
+ SRC_URI+="
+ linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
+ IUSE+=" linguas_${X%%-*}"
fi
done
fi
@@ -102,25 +102,31 @@ else
S="${WORKDIR}/comm-release"
fi
+# TODO: Move all the linguas crap to an eclass
linguas() {
- local LANG SLANG
- for LANG in ${LINGUAS}; do
- if has ${LANG} en en_US; then
- has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+ # Generate the list of language packs called "linguas"
+ # This list is used to install the xpi language packs
+ local LINGUA
+ for LINGUA in ${LINGUAS}; do
+ if has ${LINGUA} en ; then
+ # For mozilla products, en and en_US are handled internally
continue
- elif has ${LANG} ${LANGS//-/_}; then
- has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+ # If this language is supported by ${P},
+ elif has ${LINGUA} "${LANGS[@]//-/_}"; then
+ # Add the language to linguas, if it isn't already there
+ has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
continue
- elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
- for X in ${LANGS}; do
- if [[ "${X}" == "${LANG}-"* ]] && \
- [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
- has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+ # For each short LINGUA that isn't in LANGS,
+ # add *all* long LANGS to the linguas list
+ elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then
+ for LANG in "${LANGS[@]}"; do
+ if [[ ${LANG} == ${LINGUA}-* ]]; then
+ has ${LANG} "${linguas[@]}" || linguas+=(${LANG})
continue 2
fi
done
fi
- ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+ ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
done
}
@@ -129,13 +135,10 @@ src_unpack() {
if ${HAS_LANGS} ; then
linguas
- for X in ${linguas}; do
+ for X in "${linguas[@]}"; do
# FIXME: Add support for unpacking xpis to portage
- [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+ xpi_unpack "${P}-${X}.xpi"
done
- if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
- einfo "Selected language packs (first will be default): ${linguas}"
- fi
fi
}
@@ -163,17 +166,12 @@ src_prepare() {
# browser patches go here
pushd "${S}"/mozilla &>/dev/null || die
- EPATCH_EXCLUDE="5005_do_not_call_openunshareddatabse.patch
- 5006_use_system_libffi.patch
- 5006_initialize_ns_xp_come_library_file_from_ns.patch
- 5007_allow_to_pass_an_application_directory.patch
- 5008_always_load_gre_defaults_pref.patch
- 5009_provide_ns_app_pre_defaults_dir.patch
- 5011_build_fix_for_ENABLE_YARR_JIT-0.patch
- 5012_workaround_recent_arm_gnu_ld_bug.patch
- 5014_allow_to_build_yuv_convert_arm.patch
- 5017_enable_system_ffi.patch
- 5018_enable_system_ffi_part2.patch" \
+ EPATCH_EXCLUDE="1000-config_rules_install_dist_files.patch
+ 5000_arm-bug-644136.patch
+ 5010_only_add_-DEANBLE_JIT-1_to_CXXFLAGS.patch
+ 5013_dont_enable_YARR_JIT_on_mips.patch
+ 5015_add_mips_hppa_ia64_s390_sparch_defines_in_ipc.patch
+ 5016_allow_armv4t_in_nanojit.patch" \
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/_mozilla"
@@ -186,13 +184,14 @@ src_prepare() {
epatch "${WORKDIR}/_mailnews"
popd &>/dev/null || die
- epatch "${FILESDIR}"/${PN}-2.3.1-scrollbar-mouse-interaction-improvement.patch
+ epatch "${FILESDIR}"/${PN}-2.6b1-bug682677.diff
# Allow user to apply any additional patches without modifing ebuild
epatch_user
if use crypt ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+ epatch "${FILESDIR}"/enigmail/enigmail-1.3.3-bug373733.patch
cd "${S}"/mailnews/extensions/enigmail || die
./makemake -r 2&>/dev/null
sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
@@ -241,6 +240,8 @@ src_configure() {
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
mozconfig_annotate '' --enable-system-ffi
+ mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+
mozconfig_use_enable system-sqlite
mozconfig_use_enable methodjit
@@ -327,7 +328,7 @@ src_install() {
> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
|| die
- # Plugins dir
+ # Handle plugins dir through nsplugins.eclass
share_plugins_dir
doman "${S}"/suite/app/${PN}.1 || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-04 1:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-03 18:45 [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, profiles/, www-client/seamonkey/, Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2011-10-01 7:12 Lars Wendler
2011-12-04 1:10 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox