[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/seamonkey/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     a31ded56a6a1c36ad74acd6eb9d71d85528f6c59
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 16:43:15 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 16:43:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=a31ded56

Fix jpeg issues, add hardened support to seamonkey

---
 www-client/firefox/Manifest                |    2 +-
 www-client/firefox/firefox-18.0.ebuild     |    4 +++-
 www-client/seamonkey/Manifest              |    2 +-
 www-client/seamonkey/seamonkey-2.15.ebuild |    7 ++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index dae4908..40e7fb8 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -92,4 +92,4 @@ DIST firefox-18.0-zh-CN.xpi 313764 SHA256 fa5816d39c1752d987c3772414526ced9e92f6
 DIST firefox-18.0-zh-TW.xpi 315081 SHA256 9fe7a039ddaf7c0666c3e25cc87c6a342a5ac09b0316c60f7723c927167c2095 SHA512 04b5394ba81ff582c3aa7e33a75b0be483ae99a1c3effc1c57ea9a8d7d489c274b76eaec20432ac75e091472f280afcecbb7e36f7a9f51347705b66a8643731f WHIRLPOOL 3f56fdfe77f48ef8252d3f794626b7c361af78c1a64bc3f4a15ac8bc73451bf8da804d8847ee9cb10c2acec61776863f0954bf9921682968cb42acec3b882100
 DIST firefox-18.0-zu.xpi 305238 SHA256 442ea76cdfc9f94eb66c4479b9647466d1f06d5c2bad993dee45542937bdfbcd SHA512 5a059ca208b09891450f21a3ef3c49b364958658e016abd73497477b856a9126e9cd6832777c19b08a5f5f281b8d6da0e14534c1402d762b22b0e954bcae7657 WHIRLPOOL ed6415a2f397c50660e5638fc3cd1626ee08534bab06fee293a495da924de963de0bf99c9611bd9781d7abb3b0f036f690c8032f93dabe61303c6b24eeea750c
 DIST firefox-18.0.source.tar.bz2 96948716 SHA256 53f06ff49882060e811b06ceb5d59e5a8851bda23e4cc82426010de967565014 SHA512 dc2e8ccd7a12c44097762c297a7091abdcfd9830ab27ae2ea062984564c68aa47c7b61c2dfe08ad406b29072fcecc0dc9111852cdc9bede71b4f8b8bda8c8bad WHIRLPOOL 1ae098d33871fcad9215284ae3670c1978a5068b30521433f887f0ace8cdb7e5afec23f340f0489f764ff86d4c87ce1966a367a378369ea3532e0c85929b3af5
-EBUILD firefox-18.0.ebuild 11301 SHA256 55eced3a86a37bec16ead4d36e392e05f94af518f13f2b19ba2ab49fd71031d0 SHA512 6a5783d99f6332f8d43be28f61cd5a4685a9a990230d49a8c4f862738f55e7e7849fcee8d8a14722fcde3db6a1080c010cff62fa299c02246737c8a3427f00c9 WHIRLPOOL 3b4347c249d9a938d6ac04733d1bb33513e1f989bb07c06cbb464da9fba3ae7e88c2139c82f3ae31b492c1fe7bfcc3a5b7d362e24b5a0a71e6ee4642534cff78
+EBUILD firefox-18.0.ebuild 11396 SHA256 14686d9674454035362d7d5d8edf941c804ad4348fdea8aff9eb92646f4f554f SHA512 ae2cfc74ca19b60e5880ee4f35d5a21a0b8479389c0aaf556f86b3d068e304be36fbac4bebc598d1f763f814362102845206dc3225591023ae437baba073ef67 WHIRLPOOL 61ca8af4757dbb4c44ebb52521a243a90aae9ee372b7cb0d2edd45f9229516e73c925f274ed65311724b44e2d29ccd3c94b7893522070e2f340e96feab2f937f

diff --git a/www-client/firefox/firefox-18.0.ebuild b/www-client/firefox/firefox-18.0.ebuild
index f7c0ae1..b98804f 100644
--- a/www-client/firefox/firefox-18.0.ebuild
+++ b/www-client/firefox/firefox-18.0.ebuild
@@ -38,7 +38,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gstreamer +jit +minimal pgo selinux system-sqlite"
+IUSE="bindist gstreamer +jit +minimal pgo selinux system-jpeg system-sqlite"
 
 # More URIs appended below...
 SRC_URI="${SRC_URI}
@@ -57,6 +57,7 @@ RDEPEND="
 	>=media-libs/libpng-1.5.11[apng]
 	virtual/libffi
 	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
 	>=media-libs/libvpx-1.0.0
 	kernel_linux? ( media-libs/alsa-lib )
@@ -207,6 +208,7 @@ src_configure() {
 
 	mozconfig_use_enable gstreamer
 	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
 	# Feature is know to cause problems on hardened
 	mozconfig_use_enable jit methodjit
 	mozconfig_use_enable jit tracejit

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 9075111..a76557d 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -30,4 +30,4 @@ DIST seamonkey-2.15-uk.xpi 831595 SHA256 a047bed31c246951a43edf4889dc69c882612bf
 DIST seamonkey-2.15-zh-CN.xpi 801315 SHA256 c3faa1fb5d92df78bc7d376594a466daa1610f6513f4682afef129df564f335e SHA512 8c0d768c9c460057783845faccbef43d3a06969faf387752bfce71430af00d6694fc912264d5b6ba3a0a15317d9472678f4cec7f7bb8e0191bb4e34dae6612fd WHIRLPOOL bd3fcfe62aa14b38ad49c878389b7184ab058cc377ecf6a8f30a51b5915bea2da985773b59c4c0bb629a4b33c885075fd1983725e21e1b1890df37b6e5225c8b
 DIST seamonkey-2.15-zh-TW.xpi 804006 SHA256 3a1cb7817f1db7beb2c6e624f1e0022b963455a78b0fb1345aced8e0ffcb66c7 SHA512 887785a2b716115daf98d38abcf67b884a0f4ab054df2582348d1cf929f57063a9f55e3d629c54488ad15915d9012ac7cb76d44945817a47c2c67480fc321b9f WHIRLPOOL 9d3291e1d961087087e08f7de80b590b460486244f95c4d8aa99bf1baa9540e8ab006204931e78b96fdceeb406d129f491516dddaa54607eb39050433b893e80
 DIST seamonkey-2.15.source.tar.bz2 120128259 SHA256 29ef839f30bb5998cc60adfe16b2e5e64abc14e48cbf10dff98b5b3a5260f5c7 SHA512 98085c2fc0b8122de82e7cc08e72d5c598bd2fab606ef1db24ced105ba3f8f66be7199a5f6bc913c4f2ea22f298332688ea651ffc28d2b35ec11368520cfc58e WHIRLPOOL c631dfc1e01f3b1a7f1df13a8f179d3822a271236b79a4cd13e3cca436ff5205859fa752f7ce7ba469aaf5df033d81cc9ef8946a0e9270e6c34b8b141b5a7522
-EBUILD seamonkey-2.15.ebuild 10129 SHA256 e4152fac3804bead79b6ba01d18559eeb5e1272428651ad029eff480e6a91389 SHA512 f969e1ee662505cab9576aceb7008e032e382c528cf431c731b3e30fe841b8312df0dd6d66bb5ed113bd5d3ed0740a7e5912efbdfeb862bc5f7b4ec96c929145 WHIRLPOOL 1e2832ab7b1e826c9b81a18f4a4c50051cbf259964393aeb1d1e4185fec2e6450c4b212fc3bfe458f8c4666bd1a13c78c86e20f986d0e7dd26a9dbf815840e3d
+EBUILD seamonkey-2.15.ebuild 10349 SHA256 80c9b9a3ae1df2a8a7d30d1daa40eca87df5a986e336f5f65b8562dbe25a8da5 SHA512 1cfceb5b25b401b42437f6acc41f58bc1f03fce996bab0469f5d3f3eedba5deb29a4b8c9a3d5e28373ca7466d452c5253365d453d2fa900cedc4cab15e368f4f WHIRLPOOL e08bfe518576c92760fb06ed3aed11203c659237ebfb29b5a8d54093f4f260cac5688e8cd457b99fa52b886184fe54b95e77aa03de7f4a420d46041a8c3da8eb

diff --git a/www-client/seamonkey/seamonkey-2.15.ebuild b/www-client/seamonkey/seamonkey-2.15.ebuild
index bbf318a..c23ba78 100644
--- a/www-client/seamonkey/seamonkey-2.15.ebuild
+++ b/www-client/seamonkey/seamonkey-2.15.ebuild
@@ -47,7 +47,7 @@ fi
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+chatzilla +crypt gstreamer +ipc +roaming system-sqlite"
+IUSE="+chatzilla +crypt gstreamer +ipc +jit +roaming system-jpeg system-sqlite"
 
 SRC_URI+="${SRC_URI}
 	${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
@@ -73,6 +73,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 		>=media-libs/gstreamer-0.10.33:0.10
 		>=media-libs/gst-plugins-base-0.10.33:0.10
 	)
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
 	crypt? ( >=app-crypt/gnupg-1.4 )
 	kernel_linux? ( media-libs/alsa-lib )
@@ -221,6 +222,10 @@ src_configure() {
 
 	mozconfig_use_enable gstreamer
 	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	# Feature is know to cause problems on hardened
+	mozconfig_use_enable jit methodjit
+	mozconfig_use_enable jit tracejit
 
 	# Use an objdir to keep things organized.
 	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonk" \