From 5ddd5d694d70777aa366bc47f6fd55a430b50b32 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 31 Aug 2011 21:04:58 +0000 Subject: [PATCH] Security bump. Added ipc USE flag as requested in bug #381191 Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- www-client/seamonkey/ChangeLog | 8 +- www-client/seamonkey/Manifest | 58 +++- www-client/seamonkey/metadata.xml | 2 + www-client/seamonkey/seamonkey-2.3.1.ebuild | 4 +- www-client/seamonkey/seamonkey-2.3.2.ebuild | 336 ++++++++++++++++++++ 5 files changed, 389 insertions(+), 19 deletions(-) create mode 100644 www-client/seamonkey/seamonkey-2.3.2.ebuild diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 1929c4801357..55460b3e48f0 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.330 2011/08/29 21:38:16 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.331 2011/08/31 21:04:57 polynomial-c Exp $ + +*seamonkey-2.3.2 (31 Aug 2011) + + 31 Aug 2011; Lars Wendler seamonkey-2.3.1.ebuild, + +seamonkey-2.3.2.ebuild, metadata.xml: + Security bump. Added ipc USE flag as requested in bug #381191. 29 Aug 2011; Markos Chandras seamonkey-2.3.1.ebuild: Stable on amd64 wrt bug #380913 diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index ff106947236d..a05e6c462d32 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -62,24 +62,50 @@ DIST seamonkey-2.3.1-sv-SE.xpi 870151 RMD160 ffd056e08b899d12698ab692d66e1990fe9 DIST seamonkey-2.3.1-tr.xpi 805727 RMD160 413cfa8d64d29e55bdaa1dc9a94f133f03b5a808 SHA1 599285ef4be3de52463b21d3ca1ffa0453ebd9d8 SHA256 b20290ee6cacf2cbbdda38fee6fc1eebce545f0fa61d09ed75dd5ee4df52cff0 DIST seamonkey-2.3.1-zh-CN.xpi 835492 RMD160 a944e1f4204ea2b63df407ee39f4176e879f94f3 SHA1 f84c5ef0e36cd122c804722b06490814eb6d15e3 SHA256 9533b767aab2ae95b17182cb8df664a9d642d924e6026002a90a881744941b88 DIST seamonkey-2.3.1.source.tar.bz2 86960754 RMD160 725701f3c9e6cbfcba1b034fdad7f4d0caaf1a8e SHA1 c5f647c77ea5934d50ebcbfcb08b905f82f98446 SHA256 902256dab16843b66905009b60e84cd2de425223198864256020c1a195bbd061 +DIST seamonkey-2.3.2-be.xpi 793420 RMD160 c2d2fadf7f065d8fa5649c85aaaa4a5e90209d91 SHA1 9ff60f3a1db860a381ab2a566b6e9ec7880f07ff SHA256 6c6ab7ea62cd30cb80c8682dfef9cb7cca343a19dd3c60f3235ea096773f1a05 +DIST seamonkey-2.3.2-ca.xpi 812150 RMD160 fc6c82427ea5937d25dfa9d49560979e737f9193 SHA1 c9b4a9cdfb8cfb1f02c8b497571d034de6037e08 SHA256 439fd6f04419eeff1584b8362e14517d621c055eba806169b74cb6c7bf7f7382 +DIST seamonkey-2.3.2-cs.xpi 815820 RMD160 e63ab5df178a5bb80a6dd5fba7cfca57dc2c0680 SHA1 86836cdfdeb7e82b2430c1ee6882eddd8786a3b6 SHA256 2248caa8766653d2967f69fbc107c6a7ba4f77a5b41ccd4297986e2acedcacbe +DIST seamonkey-2.3.2-de.xpi 858159 RMD160 cc7d850e3648f0bb8e38475582a2a8a465225654 SHA1 c702b1d73a232f608d790f8626d13136891cd692 SHA256 705fb88b4df63a430f92ebf6bb835154546d034eba1dc28bf356fe3865609731 +DIST seamonkey-2.3.2-en-GB.xpi 788276 RMD160 6da4a4c081739a2ffbbec150e681d7f5a0046ce3 SHA1 79b1d52882c43e4442fd8b51080e0f301cf14d56 SHA256 b19f5a0fb59192704b971bc0a5636bc9d14343fade77a1a6a7174e2774f6e0ed +DIST seamonkey-2.3.2-en-US.xpi 787694 RMD160 83e26d55072ca4fd7ae3329d887b919ec43aa393 SHA1 542fde5e1d23ac9cd916abacd3a68f0db4908757 SHA256 5617dcbdcf60bf6d1f2eb5d029efdfa40301bb35d49846c96a360684d4d65b37 +DIST seamonkey-2.3.2-es-AR.xpi 813752 RMD160 be6b3362749e555075756d669b90f11bd5f2f960 SHA1 0232578cef5c5ceea0ce0bbc1db452e9aa8553b9 SHA256 117b098e5e4860ae9055272149df8b37e61cae411cc9d1b88c97836561e5bc51 +DIST seamonkey-2.3.2-es-ES.xpi 786104 RMD160 6411d9a16c1ad7fb2a0198638e5307bd2541254f SHA1 ca7c8d4cef5f8d9eb2fbc810250a4f4e9e80e852 SHA256 8c8c9fe13c3cd4141f1a91be1f995341a24bb6b6f39768ce710ca0f17c4e9335 +DIST seamonkey-2.3.2-fi.xpi 807888 RMD160 4564d4c4d03777e6df60ba69c6b29d304d71c348 SHA1 a2a8eb78341b3a0fc213036d1ebd8d6f66c0cdc3 SHA256 e8dc2335a392082286c26c2e55618d6d36ec369650faecf660e5b6881fcf2958 +DIST seamonkey-2.3.2-fr.xpi 896691 RMD160 ebc0ef368214b10f8be8c56e2143453d45f934e6 SHA1 cff58df39c1f3180f3bf44785f11c3b1d6e77fc9 SHA256 0f04340fab152edbe683db906dc81655cef036aa56eb5df81b7e8a8147aff88f +DIST seamonkey-2.3.2-gl.xpi 808027 RMD160 027aa4a99525255a35f185d93bd155a14f3ed3c4 SHA1 f719932cfdb172311d60b4c4c208a508e5342f4f SHA256 bf4f3cabcdc3f768389dc58438446f40b740218fcf04fd2d631baf867312a108 +DIST seamonkey-2.3.2-hu.xpi 829754 RMD160 ef5d28b0d8bdb34dcedbd38d274aee17a8a46ec1 SHA1 1a1438b71242877e74d8dc97d5b8e2dfb265e337 SHA256 f46e43c53fd34477d608dfaf00e8d21157b7b6b54d939c2f749f91624864cdfe +DIST seamonkey-2.3.2-it.xpi 737252 RMD160 075cc84a33cb73048cd9ef6c396e714dec600ba0 SHA1 f07cd48700cce491bbc5b14aaac68502c5b4af98 SHA256 1d92fa18b32ab62228fac53b9301fe84ff84d7c00341900e629978b8649dae45 +DIST seamonkey-2.3.2-ja.xpi 862245 RMD160 5a3271c475bb9330f7b482a8d9ae6a0ff82060ba SHA1 8a0bcfbcb5474636cad69d186d3d345274623fca SHA256 a89f13aeaef92eea7419dad3ecb048124d0f5bf1ab70eac9fd72eab0ae617d6b +DIST seamonkey-2.3.2-lt.xpi 960316 RMD160 58eb5df1b28afa38c9c4c6b3ab08b59f8ad45c67 SHA1 2762c977aabf8b19482732189df22bf2309075ff SHA256 c20d24572b15691745a3509cb2671d79b0c0ec012f8cbd52de131aeab7acda72 +DIST seamonkey-2.3.2-nb-NO.xpi 806301 RMD160 629f8015d9291c5b3f54134b21710d8507548128 SHA1 0e9211e5a3c9a1de1c003e33e2c7ee1619e33f77 SHA256 fd4a54cefe2916f078151a12d978422d40d927bbb821a96f0ea1e50b7302ca62 +DIST seamonkey-2.3.2-nl.xpi 804974 RMD160 accac54f2a334cc4fef8b3e110c88e5b053861bd SHA1 27ef336156287e28a7a6b74c1d530477090c274d SHA256 bd9af1778e650264b716eabddc4f942151588d37a4a71a7337c65292ae3b6b36 +DIST seamonkey-2.3.2-pl.xpi 826227 RMD160 95c2c720456de5707f08c743b4e65101ad0dc259 SHA1 19ae20171bddcffababa4e26514c20432e5afae0 SHA256 54095e14498bbb72bd643f16c0bd25f6d5ea06ab510644d80296a06dcb613cd8 +DIST seamonkey-2.3.2-pt-PT.xpi 843402 RMD160 9162baad333a8918fe6886983158ede5b4cd9b67 SHA1 64431a2a5b4f90649074dffeae341a9c47d7f6f0 SHA256 384618d58ecf5a95212bf065c5cbf975293db76f5275f19f7857d80098ba687f +DIST seamonkey-2.3.2-ru.xpi 889854 RMD160 ebf02af9fc812e5c37eefcc28125abe284f4ece3 SHA1 e1cb4b93755099f6b8af0a4b65517a79675665f9 SHA256 08bdfb7effb97da09444a09a71326cb977a4fe04ee5e4ee63ee241c928b4e83e +DIST seamonkey-2.3.2-sk.xpi 840867 RMD160 7fcc9132e2d102f2639d80d93e6762fc6b3aa895 SHA1 a4c30795cccaf4e710471b920cbab110ac842887 SHA256 55768eb309a497051d4e5a73cf6e5feb8ace171e5b05151123e79dcdb7c2af63 +DIST seamonkey-2.3.2-sv-SE.xpi 870151 RMD160 819d3a48f5f5451b343b045f03e400d5eb038ff8 SHA1 02a116dcd13809e7a79ea06c53591749c7193b48 SHA256 17fa3f7dbf6f9515e6c595a9b3c0d56651ae5e36d948088ae656cfa256cf7226 +DIST seamonkey-2.3.2-tr.xpi 805727 RMD160 222fcca3545d4cb9b821de09d65ed507b3f0f695 SHA1 d724ee5fa5b746a0505f523e9241b759d82bff26 SHA256 e581624b4aa379b2039df962493175e12b2bc787904f7a565b92431fa2dcc5ca +DIST seamonkey-2.3.2-zh-CN.xpi 835492 RMD160 6c9ed533f1f5ca902669a1953ed6327447697685 SHA1 895f888ba5494f30a09b2415108f8f9b130990f2 SHA256 89ce1df52ccd1affe3811980afa4a14eb765a6bbdbfcf6206d177a8ff690bc4f +DIST seamonkey-2.3.2.source.tar.bz2 87006544 RMD160 0af1fd205552cf886f16e6685a14fa0a3b397ac2 SHA1 e6fd38163098ed321ad0225c6f7d5c88f0cf3206 SHA256 3cf269a77ff1527e61909e35349f1edcee7046d707d7246424e6ecdd27905453 EBUILD seamonkey-2.0.14-r1.ebuild 10068 RMD160 f7d5bccfa3ffcb086286b63f14e5b6efdee3bb0b SHA1 d0697dc74fca26e9df5522d5d39b248b68085d07 SHA256 2f159db8ee3d4f266818f59dda7e4843e5434e636ecda0193b1ff289142acf9b -EBUILD seamonkey-2.3.1.ebuild 9529 RMD160 7d07d52a83c004f6d8ebee8de3ffc3199e08901f SHA1 70d67c5da17171a92aac4ddf929c76fa2b9db082 SHA256 d1bef4c84752522856e0d114ca6caea37ad0c464381e38edfc84c11ebf80d600 -MISC ChangeLog 44386 RMD160 4926bafe2c69f26ff783550f71819f040f6ca110 SHA1 3aebf8bd95a6f95deb1713782b524d24b0a8ce7f SHA256 e99240e0cf0ae26dfdd4c2edad4eca31894caecf5d256821c34ad2ee2a8775f1 -MISC metadata.xml 1063 RMD160 a2b1625b7d963686421e51b5efb065572eaac3a5 SHA1 87d0ef55a29e73ff0c776b87aaaf60f2ec802324 SHA256 ca8ae09cc85e470b86644061fb9345d0bd78a490e193fbaf2646a753f6e79e5f +EBUILD seamonkey-2.3.1.ebuild 9534 RMD160 136bcafef84e0b1a01a5f861e4c98d8f942ec933 SHA1 ea0ceeda240f60356bc139ada671f3aeafb88ada SHA256 392d1aac658a3c8c204fd5e16b39863f5ad48921f72e7da003ec45b07a6a49e9 +EBUILD seamonkey-2.3.2.ebuild 9540 RMD160 86383763e3fef0f9bc815bacd2dd03b7125cc186 SHA1 eff5711debebe537c46e5e04cc0b4318b02e4757 SHA256 9e3e2e13cf5a7432ce06519d554b9fad03885cd96fae4c586296d3ed0cfd7c54 +MISC ChangeLog 44607 RMD160 c3ee71c2faa8709d906bafe5230465faf57c7d59 SHA1 48c339b664d78fb064720e3fbbf37bd8b68584a5 SHA256 28d9c89fa5fc2ca51af005f3eb208b1f2ec6515ded37baf0aeef59f47bcee55c +MISC metadata.xml 1203 RMD160 07b5c5905b728e0b7521bb4439202ae1cec77c3a SHA1 f42d497b2df9c49c60cb90c12133cb606bef00ee SHA256 fb43305a3b286be0abe32304ef90b2a2611bd3f2fdc55419904b1e7b2af04178 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOXAanAAoJEPqDWhW0r/LCGpsP/3ZkNihNRezNddE7a3Kc8fsz -9SVs5pIIr8Qp3IpPDqCUd3frLdRG6VfSBdZo0oonDZNxjeeqRvW7mEfSLMtJ14NB -FRNtwsaYwgnf4dZxSgVSFeHlKnho8SWdORK4A9KFoes+acLqEVEIUdETfzsXG1TH -UXet29vNTOkBwBh6ighRv3So3Um07GxgGsyPExjHIytLHcV7QCMlmBPlLVghowNP -q7LsFAE8GZuV+/gwpJaPDM6LqtTQf3qNLhUpEX82lEdbflt+lYKD0h3k/kpQBNrw -WqKw0o2KhKR3JIX7O10UqmTXzzcYztc6/EMgGlWjT2EwnBiLTznFkuXKXbgfRo4p -Nvml3BAiKkJLgfprAfbcCvAe8RKzJMnADf+sypixtiBQNMLYSfWTwThBbCizUQs5 -szQLS0FhU8HNxJEvMTlYkFDs1ikPVES5lAL/XlJ5JoCXD7ocZGSIINIFSSPqByJr -bn9UYyiFSjTJLviRLM2DEC6YyNFPReijp7iMu4IT5NWMFbJ5AW+5YGRuSnQil3yH -CWHEcFj0lTlmfF7KdWSrbILNGwKJ+quue0oiDabrlFXWVMW14k/UOcGUj7+0Vmkk -HBxBuWzTGl96mwq2WM8HXHYP67TZQfoTkKUsMPkpoO+wAlHn2oU4ci1gWiOqiDjR -mEwaSOV86QUztiNI+Jf0 -=m6Z1 +iQIcBAEBCgAGBQJOXqIBAAoJEPiazRVxLXTFtXkQAKGnCXOFazfa/7fJGtJ+DC1E +5tpe1ETv6xNnVofC8TDJMU8ptKtPvSv4CdMOX1gfEwLeEajOqvSmXG9zbC5NOArD +X3c3ffZQA8Pyhx5njc1jLfHn8AJJznJPLUmKodwxlH03GvMIHQLZLtz3ZAhHO/tj +bWJiKdXHoeKZb5vlLBQS5cm8m6dgDsqCqWIVCgO4uSKIpqifTFbPl7KFswFduIiK +nzXCHyDNZRFa9m7K5LQmbZ4twMGZHrJTReSpOaIhc6LDiLkrX45ISJWe3OYzC5Eb +gSJVPfLZvLV0vP1yzTS8+Ciz+CWCmwsihpipK1eHyKcOcR9bum9yO6dJVpGhG2dG +tjM6i6/UNSGvr7TwR0rzjP3YBGOkxnC25vh4hUGzdQxMBi5iYNcWaxrY2j9CbjtZ +9v1pb9bPAQJGVm2Ess5MNPM4kv3EGl2mk9Lc/J06F5tVg6XwDCJiiXN6s6/FrGCQ +ZM4qE5H67QxywwvlylYpQaH7Oh+mFMFy1OXJpMKtEgTcdRO8sk+lDvUYVLjr2PSq +YpEuJmKa9TfzIoxqkc2ikmGZalrfdg2UHSD47JqzkCrWzFrdisXIohASOio1GIoZ +/qXwzR8tOZVUNRwLb8QTb02C7i1mUOnGFFGC80m/g8RPSXHmMj0/liLxR2Mgsuar +ztnMz25ljZ3XebRR0uKf +=eY5d -----END PGP SIGNATURE----- diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml index 1602652d13fb..d72fc834ee25 100644 --- a/www-client/seamonkey/metadata.xml +++ b/www-client/seamonkey/metadata.xml @@ -11,6 +11,8 @@ Fine-tune custom compiler optimizations Build Mozilla's HTML editor component (default on) + Use inter-process communication between tabs and plugins. + Allows for greater stability in case of plugin crashes Build Mozilla's Mail client (default on) Enable JIT for JavaScript using MethodJIT for faster JS performance. Hardened users can disable this USE-flag to use MPROTECT diff --git a/www-client/seamonkey/seamonkey-2.3.1.ebuild b/www-client/seamonkey/seamonkey-2.3.1.ebuild index b6bc90edfea8..fe23c8771543 100644 --- a/www-client/seamonkey/seamonkey-2.3.1.ebuild +++ b/www-client/seamonkey/seamonkey-2.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild,v 1.2 2011/08/29 21:38:16 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.1.ebuild,v 1.3 2011/08/31 21:04:58 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -32,7 +32,7 @@ if [[ ${PV} == *_pre* ]] ; then LANGPACK_PREFIX="" LANGPACK_SUFFIX="" #KEYWORDS="" - KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" #HAS_LANGS="false" else # This is where arch teams should change the KEYWORDS. diff --git a/www-client/seamonkey/seamonkey-2.3.2.ebuild b/www-client/seamonkey/seamonkey-2.3.2.ebuild new file mode 100644 index 000000000000..a4f8b51310d5 --- /dev/null +++ b/www-client/seamonkey/seamonkey-2.3.2.ebuild @@ -0,0 +1,336 @@ +# 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.3.2.ebuild,v 1.1 2011/08/31 21:04:58 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.3-patches-01" +EMVER="1.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}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +# release versions usually have language packs. So be careful with changing this. +HAS_LANGS="true" +LANGPACK_PREFIX="${MY_P}." +LANGPACK_SUFFIX=".langpack" +if [[ ${PV} == *_pre* ]] ; then + # pre-releases. No need for arch teams to change KEYWORDS here. + + REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}" + #LANG_URI="${REL_URI}/langpack" + LANG_URI="${REL_URI}/linux-i686/xpi" + LANGPACK_PREFIX="" + LANGPACK_SUFFIX="" + #KEYWORDS="" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" + #HAS_LANGS="false" +else + # This is where arch teams should change the KEYWORDS. + + #REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}" + REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}" + LANG_URI="${REL_URI}/langpack" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" + [[ ${PV} == *alpha* ]] && HAS_LANGS="false" +fi + +DESCRIPTION="Seamonkey Web Browser" +HOMEPAGE="http://www.seamonkey-project.org" + +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="+alsa +chatzilla +crypt +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 + crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )" + +if ${HAS_LANGS} ; then + for X in ${LANGS} ; do + if [ "${X}" != "en" ] ; then + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X/-/_}" + # english is handled internally + if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then + #if [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )" + #fi + IUSE="${IUSE} linguas_${X%%-*}" + fi + done +fi + +ASM_DEPEND=">=dev-lang/yasm-1.1" + +# Mesa 7.10 needed for WebGL + bugfixes +RDEPEND=">=sys-devel/binutils-2.16.1 + >=dev-libs/nss-3.12.10 + >=dev-libs/nspr-4.8.8 + >=dev-libs/glib-2.26 + >=media-libs/mesa-7.10 + >=media-libs/libpng-1.4.1[apng] + >=x11-libs/cairo-1.10 + dev-libs/libffi + system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) + crypt? ( >=app-crypt/gnupg-1.4 ) + webm? ( media-libs/libvpx + media-libs/alsa-lib )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + webm? ( amd64? ( ${ASM_DEPEND} ) + x86? ( ${ASM_DEPEND} ) )" + +if [[ ${PV} == *beta* ]] ; then + S="${WORKDIR}/comm-beta" +else + S="${WORKDIR}/comm-release" +fi + +linguas() { + local LANG SLANG + for LANG in ${LINGUAS}; do + if has ${LANG} en en_US; then + has en ${linguas} || linguas="${linguas:+"${linguas} "}en" + continue + elif has ${LANG} ${LANGS//-/_}; then + has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" + continue + elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then + for X in ${LANGS}; do + if [[ "${X}" == "${LANG}-"* ]] && \ + [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then + has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" + continue 2 + fi + done + fi + ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" + done +} + +src_unpack() { + unpack ${A} + + if ${HAS_LANGS} ; then + linguas + for X in ${linguas}; do + # FIXME: Add support for unpacking xpis to portage + [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" + done + if [[ ${linguas} != "" && ${linguas} != "en" ]]; then + einfo "Selected language packs (first will be default): ${linguas}" + fi + fi +} + +pkg_setup() { + if [[ ${PV} == *_pre* ]] ; then + ewarn "You're using an unofficial release of ${PN}. Don't file any bug in" + ewarn "Gentoo's Bugtracker against this package in case it breaks for you." + ewarn "Those belong to upstream: https://bugzilla.mozilla.org" + fi + + moz_pkgsetup + + if ! use methodjit ; then + einfo + ewarn "You are disabling the method-based JIT in JägerMonkey." + ewarn "This will greatly slowdown JavaScript in ${PN}!" + fi +} + +src_prepare() { + # Apply our patches + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/patch" + + epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \ + "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch + + # mailnews patches go here + #pushd "${S}"/mailnews &>/dev/null || die + #popd &>/dev/null || die + + # 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 + ./makemake -r 2&>/dev/null + sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \ + -i Makefile.in || die + cd "${S}" + fi + + #Ensure we disable javaxpcom by default to prevent configure breakage + sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \ + || die "sed javaxpcom" + + # Disable gnomevfs extension + sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \ + || die "Failed to remove gnomevfs extension" + + eautoreconf + cd "${S}"/mozilla || die + eautoreconf + cd "${S}"/mozilla/js/src || die + eautoreconf +} + +src_configure() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + MEXTENSIONS="" + + #################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + #################################### + + mozconfig_init + mozconfig_config + + # It doesn't compile on alpha without this LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + if ! use chatzilla ; then + MEXTENSIONS="${MEXTENSIONS},-irc" + fi + if ! use roaming ; then + MEXTENSIONS="${MEXTENSIONS},-sroaming" + fi + + mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --enable-jsd + mozconfig_annotate '' --enable-canvas + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + + mozconfig_use_enable system-sqlite + mozconfig_use_enable methodjit + + if use crypt ; then + mozconfig_annotate "mail crypt" --enable-chrome-format=jar + fi + + mozconfig_annotate '' --with-system-png + + # Finalize and report settings + mozconfig_final + + if [[ $(gcc-major-version) -lt 4 ]]; then + append-cxxflags -fno-stack-protector + elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then + if use amd64 || use x86; then + append-flags -mno-avx + fi + fi + + #################################### + # + # Configure and build + # + #################################### + + # Work around breakage in makeopts with --no-print-directory + MAKEOPTS="${MAKEOPTS/--no-print-directory/}" + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf +} + +src_compile() { + emake || die + + # Only build enigmail extension if conditions are met. + if use crypt ; then + emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed" + emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed" + fi +} + +src_install() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + declare emid + + emake DESTDIR="${D}" install || die "emake install failed" + cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die + + if use crypt ; then + cd "${T}" || die + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die + emid=$(sed -n '//!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 +} -- 2.26.2