add jit useflag, sync patchset with firefox

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

3 files changed, 38 insertions, 25 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index cc4ff823ab86..49de7572baa6 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.141 2012/05/08 09:26:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.142 2012/05/24 01:48:03 anarchy Exp $
+
+*thunderbird-12.0.1-r1 (24 May 2012)
+
+  24 May 2012; Jory A. Pratt <anarchy@gentoo.org> -thunderbird-12.0.1.ebuild,
+  +thunderbird-12.0.1-r1.ebuild:
+  Add jit useflag fix patchset from firefox
 
   08 May 2012; Lars Wendler <polynomial-c@gentoo.org>
   thunderbird-12.0.1.ebuild:
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index cddfd5337f79..ef292e95ecfd 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
@@ -25,7 +25,7 @@ AUX xulrunner-1.9.2-gtk+-2.21.patch 679 RMD160 060d514faa98768312d047985c8193434
 DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
 DIST enigmail-1.4.1.tar.gz 1344516 RMD160 f235e266acd390992f128a20f73288c2ecc3c5a5 SHA1 5c629a5d06e23c5bebb86c840f44f04f0732dbda SHA256 100bc7f9ac6bca03e4507df25c5b29d6a39d0904c46301cc7def3676779d720b
 DIST firefox-10.0-patches-0.7.tar.xz 17792 RMD160 0944a903821af98617b29fda4fb0f6fcecf28040 SHA1 6d67d372b8f4935114a8d0c72e369e55114373a1 SHA256 81b78f4ee19a70b4190484be0b6938c05a799202b6de35cfcad66eb79dc44bf9
-DIST firefox-12.0-patches-0.1.tar.xz 12996 RMD160 cd0c534410b512ca13504106465712ae51b4e5f0 SHA1 7ce3f371f43e73deca289a354dd9155b6a9bc8ff SHA256 de8573ad0019fd9b09bd94aefb3519286a04252a9d761bbf96f4c77d3c135174
+DIST firefox-12.0-patches-0.3.tar.xz 12500 RMD160 b6bd3ea865eb3a1286efbbbebdce7b08354c981e SHA1 c9c079aab10bb5c5374d91e24f5ff0fdb6278bca SHA256 a84ff93ccfac5051b915e81d2d3f6f75b72ee49000bf6bf38540e83cafe299cf
 DIST thunderbird-10.0-patches-0.1.tar.xz 860 RMD160 88bec4475cf92181abb0a2cccacb3561b0d6d21c SHA1 9a0a69838eb9c7a65497d525b587456ee768c4df SHA256 22dd2e4c1787fece81a8ab4d596b890027c2d390b4021ddc135349214f33932e
 DIST thunderbird-10.0.3esr-ar.xpi 441462 RMD160 5c766a06764de46f12f047de4f1f25d291a0fd68 SHA1 5173b44d9e4af36fcb9c0fe37c0cdd907ecc7e56 SHA256 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2
 DIST thunderbird-10.0.3esr-ast.xpi 362706 RMD160 0a7df1c5dd8909448b4079116cc2892e0a2f65d1 SHA1 f48f456c2bf5df19f62b581fdbdb4ff4f3660469 SHA256 db64f4f9e7475ac97a0f080628a423bcd7a65b25c7cd5e5f2a4aa6ddd0b6e6c9
@@ -281,25 +281,19 @@ DIST thunderbird-3.1.14-zh-TW.xpi 220657 RMD160 9e7019bda257af283f94814117a22377
 DIST thunderbird-3.1.14.source.tar.bz2 69060251 RMD160 caf136d77eaf31a6dfa42a7520db5d8d8132bce0 SHA1 62ea0edbd5265be6da98fcefad3baa36349bfdd0 SHA256 69916894c9e4177c470d08f5b82ddbb15f2fddb40e5dbd52ea7d9a8d69a9c51c
 EBUILD thunderbird-10.0.3.ebuild 8905 RMD160 81dd972ec348bc8ea6a33e858d55e34d9c0cfcc3 SHA1 65ecdefd6f7a7a2dea0f9aed3617c40fcf97c28b SHA256 bf639b6d7b3d5fcd1cf60585ca76bf6824842c41a1e3ba4625bf743295dbc61a
 EBUILD thunderbird-10.0.4.ebuild 8950 RMD160 9b03fae4c4e615aa423edbb5ed057316702d22de SHA1 cbc1b9b63d8a5b06dd957d111cc71e580da2fefe SHA256 4cd9f71204acf9630d76aba2aa7be641bd43f46356ebd50acf293d4bb23c4a12
-EBUILD thunderbird-12.0.1.ebuild 9121 RMD160 60f6f9fecaefb676fed93d39d4330b856aa4e9b4 SHA1 f309fd980b07695019c8a8dd50ae55465cfcc058 SHA256 4d742f43c3d91e201c60f28dd93343a0b39b7b0e6ae72c8566b1a635977829b3
+EBUILD thunderbird-12.0.1-r1.ebuild 9552 RMD160 4a3a3037a1f5101439608a7f3e158046729848f7 SHA1 604fada672f3542465733c9b96715dca53098656 SHA256 8cd1e7053fc0a6caf2928f5c436e6c35a7ebc208f4b97a7429e740fa7959e025
 EBUILD thunderbird-3.1.12.ebuild 8075 RMD160 2d883f455650b5c1d1a5388241b36b5b4ac28e87 SHA1 2e335bd19fe7205ebfe2f7020bb0db42431b5b08 SHA256 2f234bf655d1b533104e2fb46cedea9c9b61b5f4f5df8ea27d754c83aa8ec385
 EBUILD thunderbird-3.1.14.ebuild 8082 RMD160 140c386b6ee48b9526fc4dfcc7b556752a0dda84 SHA1 604f1e3b5cf1cf5c2698154cf502e93d8027527f SHA256 a4a9cae459778071add091cca28a853b53958a0f9167d1f5b163d6510602d47c
-MISC ChangeLog 72643 RMD160 187a68442c5361274228338bb79cbf372e7bd632 SHA1 d6848753a0321d01134a736fa65b929d76dfbc1b SHA256 16e8db1eb7e053d25af5fb46264b34bff499ce8e2aed659208193156b7196986
+MISC ChangeLog 72832 RMD160 4de7a4a934b1464eed9473c0bef0ce9a28861589 SHA1 ac9bd7180772f66320d76c35836463dc36ee561c SHA256 be62f4c3f6332b2419fbce2044462d94730daf76b86d7f6e7efc4e0ec49ee998
 MISC metadata.xml 1115 RMD160 b5671b22eef5dc7eb948a98ff32144d0edbff008 SHA1 a566c73c286e01fcc59c6c6ee1117b4df891671f SHA256 08f047bd344a5e947e84e794a20c2d0bddcb476edb5ca4867ab26dd865d682b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPqObgAAoJEPiazRVxLXTF7AAP+gMN+3J6OdcefOlfKrwaebJo
-xuU4i3WUITzjMZzmJHIxT/5mK3qWEQMnyYhah+wTLYcmVs4JWRaKpvCIB+FhgX5X
-JPgea4TSj3eSoi/cuoogaTOlIzbu80aX3RWTAheyi6W6ChQrFuVnfVUWFWoSzqyz
-dBiMrvcUltZ+md95rscctk+seZshcQ2tcYD25IetsHCdKfHvIE6D9lB23r1Klg21
-JqGnRQ3oqCNsW2WmEqTbI1YM3iVodAGS1su/74KCDa1XmNbN9ivMCEKaG63UO+/9
-+VrW5GUnObTnYIIxB58y68cmr4aVOMRvKoI5FesSeMvH2H8mg1pytb71CxusaWio
-/yGH9UMQ/VgjY+N5Y+SXD3ud0CQJabcl9F3liFIbCpsPH44pSdzA10Uwnwy3+UKY
-7Irq+yLJq0n1hgkrIq5TGJeFjIoQA9PqofYX3ta7MLEKkbeDY5oyDC132MFtsPQ5
-rfbUW6zb97+RGBonmMtiSE/iB2625vT/BPL46xQQ6rw7qCB7luqObmG52xkz3Hjz
-hyUkKnRP1KBY0M+T1GPHMH4wiiQunEkmW5R6yW+4j/tD/khDlk7k73afUykgSjjb
-BxHk5TFTE/sWUmixy9b8CcP9g40zttuumN3EEdPJsmUwEDv9tDYiYb8sjC51kadk
-hQQ2fuP23bvLZPOj9teu
-=zGUU
+iQEcBAEBAgAGBQJPvZNJAAoJEIXV9xahDnCoOiUIAKnOOcqNDA4+5vpesQWP5SFt
+uWDQHGxlI91RU02tb3SRddPtpB9FFXfiQ9gnLwzxF7NrogFVQiLvuK82iF737Ps3
+G4yZ44VQWoKn7m2Gbkj00nDF3DJ1MyCGoFFuYP8G/2PO9qa1BeO8Ox0YBEsx3wwd
+L30l/X4UAW9RjNIDOVOhMWuhiOoTWvMoHkJ29RAFExdVCZkQRLiJqdXZ+vYqGZIL
+Ps8lYSJyEJp6VtTIOlfA74/aD0r2LANHhyRCX+D01MZFeC3VTViKVluGMMmy//4i
+El7eFPPH1CC8CNKJFmrBufhGR4O6BuxCc84YTvLUiI6UM+ivkGdm+cMsPDQnVA0=
+=CRnE
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-12.0.1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
index d5befa31dc33..008e8bee5561 100644
--- a/mail-client/thunderbird/thunderbird-12.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1.ebuild,v 1.4 2012/05/08 09:26:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.1 2012/05/24 01:48:03 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -33,10 +33,10 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
+IUSE="bindist gconf +crashreporter +crypt +ipc +jit +lightning +minimal mozdom +webm"
 
 PATCH="thunderbird-10.0-patches-0.1"
-PATCHFF="firefox-12.0-patches-0.1"
+PATCHFF="firefox-12.0-patches-0.3"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -168,11 +168,14 @@ src_configure() {
 	mozconfig_annotate '' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
 	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-	mozconfig_annotate 'Missing fetures' --disable-system-cairo
+	mozconfig_annotate 'Missing features' --disable-system-cairo
 
 	# Use enable features
 	mozconfig_use_enable lightning calendar
 	mozconfig_use_enable gconf
+	# Both methodjit and tracejit conflict with PaX
+	mozconfig_use_enable jit methodjit
+	mozconfig_use_enable jit tracejit
 
 	# Bug #72667
 	if use mozdom; then
@@ -228,8 +231,11 @@ src_install() {
 	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
 		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
 
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+	# Without methodjit and tracejit there's no conflict with PaX
+	if use jit; then
+		# Pax mark xpcshell for hardened support, only used for startupcache creation.
+		pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+	fi
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
@@ -281,8 +287,15 @@ src_install() {
 			-i "${ED}"/usr/share/applications/${PN}.desktop
 	fi
 
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
+	if use jit ; then
+		pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin}
+	fi
+
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
 
+	# Plugins dir
 	share_plugins_dir
 
 	if use minimal; then